diff --git a/.circleci/config.yml b/.circleci/config.yml index 07ae54f15..d0e3921d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ executors: go-1_17: working_directory: '/go/src/github.com/influxdata/telegraf' docker: - - image: 'quay.io/influxdb/telegraf-ci:1.17.3' + - image: 'quay.io/influxdb/telegraf-ci:1.17.5' environment: GOFLAGS: -p=8 mac: diff --git a/Makefile b/Makefile index 7ef40b122..d58fb55a9 100644 --- a/Makefile +++ b/Makefile @@ -211,8 +211,8 @@ plugin-%: .PHONY: ci-1.17 ci-1.17: - docker build -t quay.io/influxdb/telegraf-ci:1.17.3 - < scripts/ci-1.17.docker - docker push quay.io/influxdb/telegraf-ci:1.17.3 + docker build -t quay.io/influxdb/telegraf-ci:1.17.5 - < scripts/ci-1.17.docker + docker push quay.io/influxdb/telegraf-ci:1.17.5 .PHONY: install install: $(buildbin) diff --git a/scripts/ci-1.17.docker b/scripts/ci-1.17.docker index 6b220c089..b93e20614 100644 --- a/scripts/ci-1.17.docker +++ b/scripts/ci-1.17.docker @@ -1,4 +1,4 @@ -FROM golang:1.17.3 +FROM golang:1.17.5 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index 2676495d3..cd92d3393 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,13 +3,13 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.17.3" +GO_VERSION="1.17.5" if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" - GO_VERSION_SHA="ffe45ef267271b9681ca96ca9b0eb9b8598dd82f7bb95b27af3eef2461dc3d2c" # from https://golang.org/dl + GO_VERSION_SHA="111f71166de0cb8089bb3e8f9f5b02d76e1bf1309256824d4062a47b0e5f98e0" # from https://golang.org/dl elif [ "$ARCH" = 'x86_64' ]; then GO_ARCH="darwin-amd64" - GO_VERSION_SHA="765c021e372a87ce0bc58d3670ab143008dae9305a79e9fa83440425529bb636" # from https://golang.org/dl + GO_VERSION_SHA="2db6a5d25815b56072465a2cacc8ed426c18f1d5fc26c1fc8c4f5a7188658264" # from https://golang.org/dl fi # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index 1571daa28..847e9644b 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.17.3" +GO_VERSION="1.17.5" setup_go () { choco upgrade golang --version=${GO_VERSION}