From 8fa52f0b5424027d10e2be04c41fddac0ab4d77c Mon Sep 17 00:00:00 2001 From: zhenghaoz Date: Sat, 16 Mar 2024 18:02:22 +0800 Subject: [PATCH] build: upgrade Go version to 1.22 (#812) --- .circleci/config.yml | 4 ++-- .github/workflows/build_release.yml | 4 ++-- .github/workflows/build_test.yml | 14 +++++++------- cmd/gorse-in-one/Dockerfile | 2 +- cmd/gorse-in-one/Dockerfile.windows | 2 +- cmd/gorse-master/Dockerfile | 2 +- cmd/gorse-master/Dockerfile.windows | 2 +- cmd/gorse-server/Dockerfile | 2 +- cmd/gorse-server/Dockerfile.windows | 2 +- cmd/gorse-worker/Dockerfile | 2 +- cmd/gorse-worker/Dockerfile.windows | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 82212cbcd..a9319248b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,9 +43,9 @@ jobs: - run: name: Upgrade Go command: | - wget https://golang.org/dl/go1.21.0.linux-arm64.tar.gz + wget https://golang.org/dl/go1.22.0.linux-arm64.tar.gz sudo rm -rf /usr/local/go - sudo tar -C /usr/local -xzf go1.21.0.linux-arm64.tar.gz + sudo tar -C /usr/local -xzf go1.22.0.linux-arm64.tar.gz - restore_cache: keys: - go-mod-v4-{{ checksum "go.sum" }} diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index ca92b376c..a2e615afb 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -9,10 +9,10 @@ jobs: name: build binaries runs-on: ubuntu-latest steps: - - name: Set up Go 1.21.x + - name: Set up Go 1.22.x uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.22.x id: go - name: Pull source diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 2fbad7ad7..8494d7a16 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -73,10 +73,10 @@ jobs: unzip ~/.gorse/download/ml-tag.zip -d ~/.gorse/dataset unzip ~/.gorse/download/criteo.zip -d ~/.gorse/dataset - - name: Set up Go 1.21.x + - name: Set up Go 1.22.x uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.22.x id: go - name: Check out code into the Go module directory @@ -142,10 +142,10 @@ jobs: # Retry all errors, including 404. This option might trigger curl upgrade. retry-all: true - - name: Set up Go 1.21.x + - name: Set up Go 1.22.x uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.22.x id: go - name: Test @@ -172,10 +172,10 @@ jobs: MYSQL_ROOT_PASSWORD: password steps: - - name: Set up Go 1.21.x + - name: Set up Go 1.22.x uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.22.x id: go - name: Check out code into the Go module directory @@ -192,7 +192,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.22.x - uses: actions/checkout@v2 - name: golangci-lint uses: golangci/golangci-lint-action@v2 diff --git a/cmd/gorse-in-one/Dockerfile b/cmd/gorse-in-one/Dockerfile index 5bb2554cf..657604aa1 100644 --- a/cmd/gorse-in-one/Dockerfile +++ b/cmd/gorse-in-one/Dockerfile @@ -1,7 +1,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 COPY . gorse diff --git a/cmd/gorse-in-one/Dockerfile.windows b/cmd/gorse-in-one/Dockerfile.windows index 8b1878366..7027ba62a 100644 --- a/cmd/gorse-in-one/Dockerfile.windows +++ b/cmd/gorse-in-one/Dockerfile.windows @@ -1,7 +1,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 COPY . gorse diff --git a/cmd/gorse-master/Dockerfile b/cmd/gorse-master/Dockerfile index 4b0fb1511..34dc3323d 100644 --- a/cmd/gorse-master/Dockerfile +++ b/cmd/gorse-master/Dockerfile @@ -3,7 +3,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 WORKDIR /src diff --git a/cmd/gorse-master/Dockerfile.windows b/cmd/gorse-master/Dockerfile.windows index 923c3ad2e..a259cebf0 100644 --- a/cmd/gorse-master/Dockerfile.windows +++ b/cmd/gorse-master/Dockerfile.windows @@ -1,7 +1,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 COPY . gorse diff --git a/cmd/gorse-server/Dockerfile b/cmd/gorse-server/Dockerfile index 43df19121..4e58ec6f4 100644 --- a/cmd/gorse-server/Dockerfile +++ b/cmd/gorse-server/Dockerfile @@ -3,7 +3,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 WORKDIR /src diff --git a/cmd/gorse-server/Dockerfile.windows b/cmd/gorse-server/Dockerfile.windows index 7807e4d56..407ea851e 100644 --- a/cmd/gorse-server/Dockerfile.windows +++ b/cmd/gorse-server/Dockerfile.windows @@ -1,7 +1,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 COPY . gorse diff --git a/cmd/gorse-worker/Dockerfile b/cmd/gorse-worker/Dockerfile index 17211a701..7a874e81f 100644 --- a/cmd/gorse-worker/Dockerfile +++ b/cmd/gorse-worker/Dockerfile @@ -3,7 +3,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 WORKDIR /src diff --git a/cmd/gorse-worker/Dockerfile.windows b/cmd/gorse-worker/Dockerfile.windows index de35220b9..c5888f146 100644 --- a/cmd/gorse-worker/Dockerfile.windows +++ b/cmd/gorse-worker/Dockerfile.windows @@ -1,7 +1,7 @@ ############################ # STEP 1 build executable binary ############################ -FROM golang:1.21 +FROM golang:1.22 COPY . gorse