From 5bc6b50c6d3135acbec7a23bd492c743782dda80 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 7 Feb 2024 11:05:15 -0500 Subject: [PATCH] Bump Go version (#5180) ## Which problem is this PR solving? - Go version linter started failing because Go 1.22 was released ## Description of the changes ```shell $ ./scripts/check-go-version.sh -u ``` ## How was this change tested? - CI Signed-off-by: Yuri Shkuro --- .github/workflows/ci-all-in-one-build.yml | 2 +- .github/workflows/ci-build-binaries.yml | 2 +- .github/workflows/ci-cassandra.yml | 2 +- .github/workflows/ci-crossdock.yml | 2 +- .github/workflows/ci-docker-build.yml | 2 +- .github/workflows/ci-elasticsearch.yml | 2 +- .github/workflows/ci-grpc-badger.yml | 2 +- .github/workflows/ci-hotrod.yml | 2 +- .github/workflows/ci-kafka.yml | 2 +- .github/workflows/ci-lint-checks.yaml | 2 +- .github/workflows/ci-opensearch.yml | 2 +- .github/workflows/ci-protogen-tests.yml | 2 +- .github/workflows/ci-release.yml | 2 +- .github/workflows/ci-unit-tests.yml | 2 +- .github/workflows/fossa.yml | 2 +- .golangci.yml | 4 ++-- docker/Makefile | 2 +- go.mod | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml index 5e37c48ff4e..0d29acfd486 100644 --- a/.github/workflows/ci-all-in-one-build.yml +++ b/.github/workflows/ci-all-in-one-build.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml index b5a3efb8903..cfba6917c4e 100644 --- a/.github/workflows/ci-build-binaries.yml +++ b/.github/workflows/ci-build-binaries.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-cassandra.yml b/.github/workflows/ci-cassandra.yml index 24ab829f382..efd4a1d0ea3 100644 --- a/.github/workflows/ci-cassandra.yml +++ b/.github/workflows/ci-cassandra.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Run cassandra integration tests run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.image }} ${{ matrix.version.schema }} diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml index be4ed2f80d0..5e85b760499 100644 --- a/.github/workflows/ci-crossdock.yml +++ b/.github/workflows/ci-crossdock.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Export BRANCH variable uses: ./.github/actions/setup-branch diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml index 54f09cb49c1..248b7252d40 100644 --- a/.github/workflows/ci-docker-build.yml +++ b/.github/workflows/ci-docker-build.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml index c46cf3ffc92..f9cd20c6eec 100644 --- a/.github/workflows/ci-elasticsearch.yml +++ b/.github/workflows/ci-elasticsearch.yml @@ -50,7 +50,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Install tools run: make install-ci diff --git a/.github/workflows/ci-grpc-badger.yml b/.github/workflows/ci-grpc-badger.yml index ee8d2e748b8..265d170491f 100644 --- a/.github/workflows/ci-grpc-badger.yml +++ b/.github/workflows/ci-grpc-badger.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Run Badger storage integration tests run: make badger-storage-integration-test diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml index 976c16c2e11..3f559b3e82a 100644 --- a/.github/workflows/ci-hotrod.yml +++ b/.github/workflows/ci-hotrod.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Export BRANCH variable uses: ./.github/actions/setup-branch diff --git a/.github/workflows/ci-kafka.yml b/.github/workflows/ci-kafka.yml index e3cc8d715a0..69617f23e9b 100644 --- a/.github/workflows/ci-kafka.yml +++ b/.github/workflows/ci-kafka.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Run kafka integration tests run: bash scripts/kafka-integration-test.sh -k diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml index b3c4ddabd55..1525be60037 100644 --- a/.github/workflows/ci-lint-checks.yaml +++ b/.github/workflows/ci-lint-checks.yaml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Install tools run: make install-test-tools diff --git a/.github/workflows/ci-opensearch.yml b/.github/workflows/ci-opensearch.yml index 816e90f970e..158845e8100 100644 --- a/.github/workflows/ci-opensearch.yml +++ b/.github/workflows/ci-opensearch.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Install tools run: make install-ci diff --git a/.github/workflows/ci-protogen-tests.yml b/.github/workflows/ci-protogen-tests.yml index 422fa716326..313a064c997 100644 --- a/.github/workflows/ci-protogen-tests.yml +++ b/.github/workflows/ci-protogen-tests.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Verify Protobuf types are up to date run: make proto && git diff --name-status --exit-code diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index b8b8cc3b33a..3b1efe5d166 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index 5ee044b8122..6e85579bcb9 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x cache-dependency-path: ./go.sum - name: Install test deps diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index dda9eae960c..8e93b11bec0 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.21.x + go-version: 1.22.x - name: Add GOPATH run: | diff --git a/.golangci.yml b/.golangci.yml index c05d1273432..90011ed3a3a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -131,7 +131,7 @@ linters-settings: - G404 - G601 gosimple: - go: "1.20" + go: "1.21" govet: check-shadowing: false enable-all: true @@ -160,7 +160,7 @@ linters-settings: - suite-extra-assert-call run: - go: "1.20" + go: "1.21" timeout: 20m skip-dirs-use-default: false skip-dirs: diff --git a/docker/Makefile b/docker/Makefile index f8a11cd9894..237bb8c5306 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,7 +1,7 @@ VERSION := 1.0.0 ROOT_IMAGE ?= alpine:3.16 CERT_IMAGE := $(ROOT_IMAGE) -GOLANG_IMAGE := golang:1.21-alpine +GOLANG_IMAGE := golang:1.22-alpine DOCKER_REGISTRY ?= localhost:5000 BASE_IMAGE ?= $(DOCKER_REGISTRY)/baseimg_alpine:latest diff --git a/go.mod b/go.mod index 24345c341a0..bc307b1097f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jaegertracing/jaeger -go 1.20 +go 1.21 require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2