diff --git a/.circleci/config.yml b/.circleci/config.yml index f4d78f9f5..5b4cbb4e6 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.20.5' + - image: 'quay.io/influxdb/telegraf-ci:1.20.6' environment: GOFLAGS: -p=4 mac: diff --git a/Makefile b/Makefile index 7d3c39151..8322ad084 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.20.5 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.20.5 + docker build -t quay.io/influxdb/telegraf-ci:1.20.6 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.20.6 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index 27124a328..2a4e4e7be 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.20.5 +FROM golang:1.20.6 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index 32d4421b1..c9a5fd9c7 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.20.5" +GO_VERSION="1.20.6" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612" +GO_VERSION_SHA="b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index 9f1ccf1e9..85bd924e8 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.20.5" -GO_VERSION_SHA_arm64="94ad76b7e1593bb59df7fd35a738194643d6eed26a4181c94e3ee91381e40459" # from https://golang.org/dl -GO_VERSION_SHA_amd64="79715ca5b8becd120703ac9af5d1da749e095d2b9bf830c4f3af4b15b2cb049d" # from https://golang.org/dl +GO_VERSION="1.20.6" +GO_VERSION_SHA_arm64="1163be1998835a13f00dfc869a8e3cdebf86984ad41ff2fff43e35ac2a0d8344" # from https://golang.org/dl +GO_VERSION_SHA_amd64="98a09c085b4c385abae7d35b9155195d5e584d14988347ac7f18e4cbe3b5ef3d" # 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 43e311528..4ca8e80d0 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.20.5" +GO_VERSION="1.20.6" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}