From b9fa5b4c8e25e5d1c67fbbd1a0a80993a5ae7ba3 Mon Sep 17 00:00:00 2001 From: Dane Strandboge <136023093+DStrand1@users.noreply.github.com> Date: Mon, 18 Nov 2024 07:12:45 -0600 Subject: [PATCH] chore: Update go to v1.23.3 (#16180) --- .circleci/config.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 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e885c544..9ba7e9c4f 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.23.2' + - image: 'quay.io/influxdb/telegraf-ci:1.23.3' environment: GOFLAGS: -p=4 mac: diff --git a/.github/workflows/readme-linter.yml b/.github/workflows/readme-linter.yml index 86007a143..e8bca6d25 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.23.2' + go-version: '1.23.3' - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/Makefile b/Makefile index 2ad0a07e6..543bd9ae2 100644 --- a/Makefile +++ b/Makefile @@ -257,8 +257,8 @@ plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl .PHONY: ci ci: - docker build -t quay.io/influxdb/telegraf-ci:1.23.2 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.23.2 + docker build -t quay.io/influxdb/telegraf-ci:1.23.3 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.23.3 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index d87ea8c5b..65eed0d0a 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.23.3 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index 46bf5eb34..e792f11cf 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.23.2" +GO_VERSION="1.23.3" GO_ARCH="linux-amd64" # from https://go.dev/dl -GO_VERSION_SHA="542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e" +GO_VERSION_SHA="a0afb9744c00648bafb1b90b4aba5bdb86f424f02f9275399ce0c20b93a2c3a8" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index fe37a5571..076a53223 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.23.2" -GO_VERSION_SHA_arm64="d87031194fe3e01abdcaf3c7302148ade97a7add6eac3fec26765bcb3207b80f" # from https://go.dev/dl -GO_VERSION_SHA_amd64="445c0ef19d8692283f4c3a92052cc0568f5a048f4e546105f58e991d4aea54f5" # from https://go.dev/dl +GO_VERSION="1.23.3" +GO_VERSION_SHA_arm64="31e119fe9bde6e105407a32558d5b5fa6ca11e2bd17f8b7b2f8a06aba16a0632" # from https://go.dev/dl +GO_VERSION_SHA_amd64="c7e024d5c0bc81845070f23598caf02f05b8ae88fd4ad2cd3e236ddbea833ad2" # from https://go.dev/dl if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index 5e6a5d596..15d82bc2e 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.23.2" +GO_VERSION="1.23.3" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}