From 0f5ced7aab5e7f4ef782056d1186213a9cae3fa1 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Fri, 10 Mar 2023 05:42:41 -0700 Subject: [PATCH] chore: Update to go1.20.2 (#12824) --- .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 de1e5faa3..d199971b2 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.1' + - image: 'quay.io/influxdb/telegraf-ci:1.20.2' environment: GOFLAGS: -p=4 mac: diff --git a/Makefile b/Makefile index 434d2c84e..f3af5bb87 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.1 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.20.1 + docker build -t quay.io/influxdb/telegraf-ci:1.20.2 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.20.2 .PHONY: install install: $(buildbin) diff --git a/scripts/ci.docker b/scripts/ci.docker index d86041982..1e8b8ae39 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.20.1 +FROM golang:1.20.2 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index 1115ca157..d9c0bd92d 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.20.1" +GO_VERSION="1.20.2" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02" +GO_VERSION_SHA="4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index 906ad3c7a..2e5494032 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.20.1" -GO_VERSION_SHA_arm64="f1a8e06c7f1ba1c008313577f3f58132eb166a41ceb95ce6e9af30bc5a3efca4" # from https://golang.org/dl -GO_VERSION_SHA_amd64="a300a45e801ab459f3008aae5bb9efbe9a6de9bcd12388f5ca9bbd14f70236de" # from https://golang.org/dl +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 if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index e90712fff..a598e9e0a 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.20.1" +GO_VERSION="1.20.2" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}