From 8d8d1bfb4f4fd2ccb4209c111eb0122d9a0eb63a Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Wed, 6 Mar 2024 08:46:49 -0700 Subject: [PATCH] chore: Update to go1.22.1 (#14940) --- .circleci/config.yml | 2 +- .github/workflows/govulncheck.yml | 2 +- .github/workflows/readme-linter.yml | 2 +- Makefile | 4 ++-- scripts/ci.docker | 2 +- scripts/installgo_linux.sh | 4 ++-- scripts/installgo_mac.sh | 6 +++--- scripts/installgo_windows.sh | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5188242c05ef6..27c54a18f27b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ executors: working_directory: '/go/src/github.com/influxdata/telegraf' resource_class: large docker: - - image: 'quay.io/influxdb/telegraf-ci:1.22.0' + - image: 'quay.io/influxdb/telegraf-ci:1.22.1' environment: GOFLAGS: -p=4 mac: diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 7596ee795aca3..04aa58dcc445a 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -15,5 +15,5 @@ jobs: - name: Scan for Vulnerabilities in Code uses: golang/govulncheck-action@v1 with: - go-version-input: 1.22.0 + go-version-input: 1.22.1 go-package: ./... diff --git a/.github/workflows/readme-linter.yml b/.github/workflows/readme-linter.yml index b35c9e18c88c9..0ad74883c7a3a 100644 --- a/.github/workflows/readme-linter.yml +++ b/.github/workflows/readme-linter.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.22.0' + go-version: '1.22.1' - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/Makefile b/Makefile index 10d468110f44a..6bb5460844760 100644 --- a/Makefile +++ b/Makefile @@ -249,8 +249,8 @@ plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl .PHONY: ci ci: - docker build -t quay.io/influxdb/telegraf-ci:1.22.0 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.22.0 + docker build -t quay.io/influxdb/telegraf-ci:1.22.1 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.22.1 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index 2da0db3759905..7b33ec26aceb4 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.22.0 +FROM golang:1.22.1 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index 4671118de995c..e97a6a829aafe 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.22.0" +GO_VERSION="1.22.1" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265" +GO_VERSION_SHA="aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index c67fe2eb22c2d..c822149ccbf95 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.22.0" -GO_VERSION_SHA_arm64="bf8e388b09134164717cd52d3285a4ab3b68691b80515212da0e9f56f518fb1e" # from https://golang.org/dl -GO_VERSION_SHA_amd64="ebca81df938d2d1047cc992be6c6c759543cf309d401b86af38a6aed3d4090f4" # from https://golang.org/dl +GO_VERSION="1.22.1" +GO_VERSION_SHA_arm64="f6a9cec6b8a002fcc9c0ee24ec04d67f430a52abc3cfd613836986bcc00d8383" # from https://golang.org/dl +GO_VERSION_SHA_amd64="3bc971772f4712fec0364f4bc3de06af22a00a12daab10b6f717fdcd13156cc0" # from https://golang.org/dl if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index 0292a76848d5a..15e8defb16f62 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.22.0" +GO_VERSION="1.22.1" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}