diff --git a/.circleci/config.yml b/.circleci/config.yml index aa19d80e1..bccaa3b3a 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.3' + - image: 'quay.io/influxdb/telegraf-ci:1.20.4' environment: GOFLAGS: -p=4 mac: diff --git a/Makefile b/Makefile index 7db890daf..d6cb274b8 100644 --- a/Makefile +++ b/Makefile @@ -247,8 +247,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.3 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.20.3 + docker build -t quay.io/influxdb/telegraf-ci:1.20.4 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.20.4 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index 3220fdb5d..498f212a9 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.20.3 +FROM golang:1.20.4 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index f1536bbca..b559245da 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.20.3" +GO_VERSION="1.20.4" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca" +GO_VERSION_SHA="698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index a0f855beb..10328e8b9 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.20.3" -GO_VERSION_SHA_arm64="86b0ed0f2b2df50fa8036eea875d1cf2d76cefdacf247c44639a1464b7e36b95" # from https://golang.org/dl -GO_VERSION_SHA_amd64="c1e1161d6d859deb576e6cfabeb40e3d042ceb1c6f444f617c3c9d76269c3565" # from https://golang.org/dl +GO_VERSION="1.20.4" +GO_VERSION_SHA_arm64="61bd4f7f2d209e2a6a7ce17787fc5fea52fb11cc9efb3d8471187a8b39ce0dc9" # from https://golang.org/dl +GO_VERSION_SHA_amd64="242b099b5b9bd9c5d4d25c041216bc75abcdf8e0541aec975eeabcbce61ad47f" # 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 7bff4d091..1ff257958 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.20.3" +GO_VERSION="1.20.4" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}