From 22aeeaf0574520bc48c49e9c99dd35ceeebb7b14 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Wed, 7 Jun 2023 03:08:10 -0600 Subject: [PATCH] chore: Update to go1.20.5 (#13401) --- .circleci/config.yml | 2 +- Makefile | 4 ++-- scripts/ci.docker | 2 +- scripts/installgo_linux.sh | 4 ++-- scripts/installgo_mac.sh | 6 +++--- scripts/installgo_windows.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a49e2d6ce..f4d78f9f5 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.4' + - image: 'quay.io/influxdb/telegraf-ci:1.20.5' environment: GOFLAGS: -p=4 mac: diff --git a/Makefile b/Makefile index 3b4e89b89..c3dc24575 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.4 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.20.4 + docker build -t quay.io/influxdb/telegraf-ci:1.20.5 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.20.5 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index 498f212a9..27124a328 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.20.4 +FROM golang:1.20.5 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index b559245da..32d4421b1 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.20.4" +GO_VERSION="1.20.5" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd" +GO_VERSION_SHA="d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index 10328e8b9..9f1ccf1e9 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -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 +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 if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index 1ff257958..43e311528 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.20.4" +GO_VERSION="1.20.5" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}