From 4fab9d7b4bdf223129f3f2942ff04ae67339c26b Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Wed, 17 Feb 2021 11:42:03 +0800 Subject: [PATCH] ci: use stable version of go1.16 --- .github/workflows/build.yml | 6 ++---- .github/workflows/release.yml | 3 +-- Dockerfile | 2 +- go.mod | 2 +- go.sum | 2 ++ 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e9fa67..2f29b93 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - stable: false - go-version: 1.16.0-rc1 + go-version: '1.16' - name: Go Env run: go env - name: Test @@ -29,8 +28,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - stable: false - go-version: 1.16.0-rc1 + go-version: '1.16' - name: Go Env run: go env - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 10216be..e1a2df0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - stable: false - go-version: 1.16.0-rc1 + go-version: '1.16' - name: Go Env run: go env - name: Run GoReleaser diff --git a/Dockerfile b/Dockerfile index af0db31..aeab593 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.16rc1-alpine AS build-env +FROM golang:alpine AS build-env RUN apk --no-cache add build-base git gcc ADD . /src RUN cd /src && go build -v -ldflags "-s -w" diff --git a/go.mod b/go.mod index 44cb07e..707b5e4 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/xtaci/kcp-go/v5 v5.6.1 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect - golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect + golang.org/x/sys v0.0.0-20210216224549-f992740a1bac // indirect ) // Replace dependency modules with local developing copy diff --git a/go.sum b/go.sum index ca8d27e..d8bbda5 100644 --- a/go.sum +++ b/go.sum @@ -154,6 +154,8 @@ golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216224549-f992740a1bac h1:9glrpwtNjBYgRpb67AZJKHfzj1stG/8BL5H7In2oTC4= +golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=