diff --git a/.circleci/config.yml b/.circleci/config.yml index 4792c43e5..d269446b4 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.3' + - image: 'quay.io/influxdb/telegraf-ci:1.22.4' environment: GOFLAGS: -p=4 mac: diff --git a/.github/workflows/readme-linter.yml b/.github/workflows/readme-linter.yml index 1ea1ef27b..81c7274b3 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.3' + go-version: '1.22.4' - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/Makefile b/Makefile index ba27abcaa..6ed3ef41a 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.3 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.22.3 + docker build -t quay.io/influxdb/telegraf-ci:1.22.4 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.22.4 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index f89995bfb..c8ab38b76 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.22.3 +FROM golang:1.22.4 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index 7862819e8..b6b5a620c 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.22.3" +GO_VERSION="1.22.4" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36" +GO_VERSION_SHA="ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index ddd374939..06aed3791 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.22.3" -GO_VERSION_SHA_arm64="02abeab3f4b8981232237ebd88f0a9bad933bc9621791cd7720a9ca29eacbe9d" # from https://golang.org/dl -GO_VERSION_SHA_amd64="610e48c1df4d2f852de8bc2e7fd2dc1521aac216f0c0026625db12f67f192024" # from https://golang.org/dl +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 if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index 9d2a547a8..ba0b15b9f 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.22.3" +GO_VERSION="1.22.4" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}