From 4dc0b2c0f6f4bb5ba33a473bd329e6bce3502fb1 Mon Sep 17 00:00:00 2001 From: Sebastian Spaink Date: Mon, 26 Jul 2021 16:36:52 -0500 Subject: [PATCH 1/3] Update Go to v1.16.6 --- .circleci/config.yml | 6 +++--- Makefile | 4 ++-- scripts/alpine.docker | 2 +- scripts/buster.docker | 2 +- scripts/ci-1.16.docker | 2 +- scripts/mac_installgo.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03fe58b17a739..010c54a0fedfd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ executors: go-1_16: working_directory: '/go/src/github.com/influxdata/telegraf' docker: - - image: 'quay.io/influxdb/telegraf-ci:1.16.5' + - image: 'quay.io/influxdb/telegraf-ci:1.16.6' environment: GOFLAGS: -p=8 mac: @@ -150,7 +150,7 @@ jobs: steps: - checkout - check-changed-files-or-halt-windows - - run: choco upgrade golang --version=1.16.5 + - run: choco upgrade golang --version=1.16.6 - run: choco install make - run: git config --system core.longpaths true - run: make test-windows @@ -448,4 +448,4 @@ workflows: filters: branches: only: - - master \ No newline at end of file + - master diff --git a/Makefile b/Makefile index 4f6ef13e8e4af..5cf7d2383604f 100644 --- a/Makefile +++ b/Makefile @@ -201,8 +201,8 @@ ci-1.15: .PHONY: ci-1.16 ci-1.16: - docker build -t quay.io/influxdb/telegraf-ci:1.16.5 - < scripts/ci-1.16.docker - docker push quay.io/influxdb/telegraf-ci:1.16.5 + docker build -t quay.io/influxdb/telegraf-ci:1.16.6 - < scripts/ci-1.16.docker + docker push quay.io/influxdb/telegraf-ci:1.16.6 .PHONY: install install: $(buildbin) diff --git a/scripts/alpine.docker b/scripts/alpine.docker index 673498c6f598e..d5b8b85f6abb7 100644 --- a/scripts/alpine.docker +++ b/scripts/alpine.docker @@ -1,4 +1,4 @@ -FROM golang:1.16.5 as builder +FROM golang:1.16.6 as builder WORKDIR /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/buster.docker b/scripts/buster.docker index 4276730b4bf1e..685d30067e0ef 100644 --- a/scripts/buster.docker +++ b/scripts/buster.docker @@ -1,4 +1,4 @@ -FROM golang:1.16.5-buster as builder +FROM golang:1.16.6-buster as builder WORKDIR /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/ci-1.16.docker b/scripts/ci-1.16.docker index 585abc137e060..f0b2badafd521 100644 --- a/scripts/ci-1.16.docker +++ b/scripts/ci-1.16.docker @@ -1,4 +1,4 @@ -FROM golang:1.16.5 +FROM golang:1.16.6 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/mac_installgo.sh b/scripts/mac_installgo.sh index 285db8b315fc2..39b6b372314d8 100644 --- a/scripts/mac_installgo.sh +++ b/scripts/mac_installgo.sh @@ -3,7 +3,7 @@ set -eux GO_ARCH="darwin-amd64" -GO_VERSION="1.16.5" +GO_VERSION="1.16.6" GO_VERSION_SHA="be761716d5bfc958a5367440f68ba6563509da2f539ad1e1864bd42fe553f277" # from https://golang.org/dl # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) From d69041b6718f46a2856a5410404c4bfc51fb6e75 Mon Sep 17 00:00:00 2001 From: Sebastian Spaink Date: Mon, 26 Jul 2021 16:40:19 -0500 Subject: [PATCH 2/3] Update Mac SHA --- scripts/mac_installgo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mac_installgo.sh b/scripts/mac_installgo.sh index 39b6b372314d8..8c6c00cefbbd4 100644 --- a/scripts/mac_installgo.sh +++ b/scripts/mac_installgo.sh @@ -4,7 +4,7 @@ set -eux GO_ARCH="darwin-amd64" GO_VERSION="1.16.6" -GO_VERSION_SHA="be761716d5bfc958a5367440f68ba6563509da2f539ad1e1864bd42fe553f277" # from https://golang.org/dl +GO_VERSION_SHA="0b49b6cbe50b30aa0a5bb9f8ccdbb43f9cd3d9a3c36a769b8e46777d694539b5" # from https://golang.org/dl # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) path="/usr/local/Cellar" From ba2abf9955e7d0c6bafbdb2436f282c8aa336bf5 Mon Sep 17 00:00:00 2001 From: Sebastian Spaink Date: Mon, 26 Jul 2021 16:44:02 -0500 Subject: [PATCH 3/3] Add correct mac checksum --- scripts/mac_installgo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mac_installgo.sh b/scripts/mac_installgo.sh index 8c6c00cefbbd4..aab4731c22f30 100644 --- a/scripts/mac_installgo.sh +++ b/scripts/mac_installgo.sh @@ -4,7 +4,7 @@ set -eux GO_ARCH="darwin-amd64" GO_VERSION="1.16.6" -GO_VERSION_SHA="0b49b6cbe50b30aa0a5bb9f8ccdbb43f9cd3d9a3c36a769b8e46777d694539b5" # from https://golang.org/dl +GO_VERSION_SHA="e4e83e7c6891baa00062ed37273ce95835f0be77ad8203a29ec56dbf3d87508a" # from https://golang.org/dl # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) path="/usr/local/Cellar"