From 797824d5fc7886e851f0fadb5e6fc1bd8c3e07ed Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Tue, 11 Apr 2023 03:44:57 -0600 Subject: [PATCH] chore: Update to go1.20.3 (#13055) --- .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 d309cdfaf..14d369047 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.2' + - image: 'quay.io/influxdb/telegraf-ci:1.20.3' environment: GOFLAGS: -p=4 mac: diff --git a/Makefile b/Makefile index 1d91c56dc..1ecd9c302 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.2 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.20.2 + docker build -t quay.io/influxdb/telegraf-ci:1.20.3 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.20.3 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index 1e8b8ae39..3220fdb5d 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.20.2 +FROM golang:1.20.3 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index d9c0bd92d..f1536bbca 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.20.2" +GO_VERSION="1.20.3" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768" +GO_VERSION_SHA="979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index 2e5494032..a0f855beb 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.20.2" -GO_VERSION_SHA_arm64="7343c87f19e79c0063532e82e1c4d6f42175a32d99f7a4d15e658e88bf97f885" # from https://golang.org/dl -GO_VERSION_SHA_amd64="c93b8ced9517d07e1cd4c362c6e2d5242cb139e29b417a328fbf19aded08764c" # from https://golang.org/dl +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 if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index a598e9e0a..7bff4d091 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.20.2" +GO_VERSION="1.20.3" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}