From 1023bce6f0fce10bf987071ef0ab2d509a79d7f3 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 16 Aug 2021 17:14:32 -0700 Subject: [PATCH 1/5] update go version --- .github/workflows/release.yml | 4 ++-- .github/workflows/release_binaries.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c51f3ff88..7905b9420 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: - name: Go Release Binaries uses: wangyoucao577/go-release-action@v1.17 with: - goversion: 1.16 + goversion: 1.17 github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} @@ -52,7 +52,7 @@ jobs: - name: Go Release Binaries uses: wangyoucao577/go-release-action@v1.17 with: - goversion: 1.16 + goversion: 1.17 github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} diff --git a/.github/workflows/release_binaries.yml b/.github/workflows/release_binaries.yml index 8acb983fb..ca3457c8b 100644 --- a/.github/workflows/release_binaries.yml +++ b/.github/workflows/release_binaries.yml @@ -30,7 +30,7 @@ jobs: - name: Go Release Binaries uses: wangyoucao577/go-release-action@v1.19 with: - goversion: 1.16 + goversion: 1.17 github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} @@ -45,7 +45,7 @@ jobs: - name: Go Release Large Disk Binaries uses: wangyoucao577/go-release-action@v1.19 with: - goversion: 1.16 + goversion: 1.17 github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} From f316de3b5c07acd102a5c3c8a2b6ede719118493 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 16 Aug 2021 17:17:24 -0700 Subject: [PATCH 2/5] disable travis --- .travis.yml => .travis.yml.disabled | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .travis.yml => .travis.yml.disabled (97%) diff --git a/.travis.yml b/.travis.yml.disabled similarity index 97% rename from .travis.yml rename to .travis.yml.disabled index 7934e1ead..d34427fc7 100644 --- a/.travis.yml +++ b/.travis.yml.disabled @@ -1,7 +1,7 @@ sudo: false language: go go: - - 1.16.x + - 1.17.x before_install: - export PATH=/home/travis/gopath/bin:$PATH @@ -43,4 +43,4 @@ deploy: on: tags: true repo: chrislusf/seaweedfs - go: 1.16.x + go: 1.17.x From 5315fcb820645983e675b58e184fe63ef5e1220f Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 16 Aug 2021 17:24:16 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bc7fae408..7e1cd0812 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Slack](https://img.shields.io/badge/slack-purple)](https://join.slack.com/t/seaweedfs/shared_invite/enQtMzI4MTMwMjU2MzA3LTEyYzZmZWYzOGQ3MDJlZWMzYmI0OTE4OTJiZjJjODBmMzUxNmYwODg0YjY3MTNlMjBmZDQ1NzQ5NDJhZWI2ZmY) [![Twitter](https://img.shields.io/twitter/follow/seaweedfs.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=seaweedfs) -[![Build Status](https://travis-ci.com/chrislusf/seaweedfs.svg?branch=master)](https://travis-ci.com/chrislusf/seaweedfs) +[![Build Status](https://img.shields.io/github/workflow/status/chrislusf/seaweedfs/Go)](https://github.com/chrislusf/seaweedfs/actions/workflows/go.yml) [![GoDoc](https://godoc.org/github.com/chrislusf/seaweedfs/weed?status.svg)](https://godoc.org/github.com/chrislusf/seaweedfs/weed) [![Wiki](https://img.shields.io/badge/docs-wiki-blue.svg)](https://github.com/chrislusf/seaweedfs/wiki) [![Docker Pulls](https://img.shields.io/docker/pulls/chrislusf/seaweedfs?maxAge=4800)](https://hub.docker.com/r/chrislusf/seaweedfs/) From 7bf65c1e991eeb71cffc3b63df0b8e9a24071b83 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 16 Aug 2021 18:47:28 -0700 Subject: [PATCH 4/5] use go 1.17 for docker --- docker/Dockerfile.go_build | 2 +- docker/Dockerfile.go_build_large | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index 01334280d..3a62cf5a3 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -1,4 +1,4 @@ -FROM amd64/golang:1.16-alpine as builder +FROM amd64/golang:1.17-alpine as builder RUN apk add git g++ fuse RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs diff --git a/docker/Dockerfile.go_build_large b/docker/Dockerfile.go_build_large index 2d67a1924..b0433257c 100644 --- a/docker/Dockerfile.go_build_large +++ b/docker/Dockerfile.go_build_large @@ -1,4 +1,4 @@ -FROM amd64/golang:1.16-alpine as builder +FROM amd64/golang:1.17-alpine as builder RUN apk add git g++ fuse RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs From d24ad925132667313e8d1810c1d3641b381ecbc6 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 16 Aug 2021 18:47:42 -0700 Subject: [PATCH 5/5] fix building latest docker image --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2165466ca..cf8eac251 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN \ # Install SeaweedFS and Supercronic ( for cron job mode ) apk add --no-cache --virtual build-dependencies --update wget curl ca-certificates && \ apk add fuse && \ - wget -P /tmp https://github.com/$(curl -s -L https://github.com/chrislusf/seaweedfs/releases/${RELEASE} | egrep -o "chrislusf/seaweedfs/releases/download/.*/linux_$ARCH.tar.gz") && \ + wget -P /tmp https://github.com/$(curl -s -L https://github.com/chrislusf/seaweedfs/releases/${RELEASE} | egrep -o "chrislusf/seaweedfs/releases/download/.*/linux_$ARCH.tar.gz" | head -n 1) && \ tar -C /usr/bin/ -xzvf /tmp/linux_$ARCH.tar.gz && \ curl -fsSLO "$SUPERCRONIC_URL" && \ echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - && \