Skip to content

Commit

Permalink
Update Go to v1.16.6 (#9542)
Browse files Browse the repository at this point in the history
(cherry picked from commit a1dae0d)
  • Loading branch information
sspaink authored and reimda committed Jul 28, 2021
1 parent cce7539 commit 18b2719
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -448,4 +448,4 @@ workflows:
filters:
branches:
only:
- master
- master
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion scripts/alpine.docker
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/buster.docker
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-1.16.docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.5
FROM golang:1.16.6

RUN chmod -R 755 "$GOPATH"

Expand Down
4 changes: 2 additions & 2 deletions scripts/mac_installgo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
set -eux

GO_ARCH="darwin-amd64"
GO_VERSION="1.16.5"
GO_VERSION_SHA="be761716d5bfc958a5367440f68ba6563509da2f539ad1e1864bd42fe553f277" # from https://golang.org/dl
GO_VERSION="1.16.6"
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"
Expand Down

0 comments on commit 18b2719

Please sign in to comment.