diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e82f1f36..b934af0fb 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.4' + - image: 'quay.io/influxdb/telegraf-ci:1.22.5' environment: GOFLAGS: -p=4 mac: diff --git a/.github/workflows/readme-linter.yml b/.github/workflows/readme-linter.yml index 81c7274b3..331fc847a 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.4' + go-version: '1.22.5' - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/Makefile b/Makefile index 5d25bde22..923131732 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.22.4 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.22.4 + docker build -t quay.io/influxdb/telegraf-ci:1.22.5 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.22.5 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index c8ab38b76..6f1120bab 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.22.4 +FROM golang:1.22.5 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index b6b5a620c..9a07f6255 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.22.4" +GO_VERSION="1.22.5" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d" +GO_VERSION_SHA="904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index 06aed3791..8e1c563cf 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.22.4" -GO_VERSION_SHA_arm64="242b78dc4c8f3d5435d28a0d2cec9b4c1aa999b601fb8aa59fb4e5a1364bf827" # from https://golang.org/dl -GO_VERSION_SHA_amd64="c95967f50aa4ace34af0c236cbdb49a9a3e80ee2ad09d85775cb4462a5c19ed3" # from https://golang.org/dl +GO_VERSION="1.22.5" +GO_VERSION_SHA_arm64="4cd1bcb05be03cecb77bccd765785d5ff69d79adf4dd49790471d00c06b41133" # from https://golang.org/dl +GO_VERSION_SHA_amd64="95d9933cdcf45f211243c42c7705c37353cccd99f27eb4d8e2d1bf2f4165cb50" # 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 ba0b15b9f..4e12ea47b 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.22.4" +GO_VERSION="1.22.5" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}