Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Go to v1.16.6 #9542

Merged
merged 3 commits into from
Jul 27, 2021
Merged

Update Go to v1.16.6 #9542

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dc0b2c
Update Go to v1.16.6
Jul 26, 2021
d69041b
Update Mac SHA
Jul 26, 2021
ba2abf9
Add correct mac checksum
Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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="0b49b6cbe50b30aa0a5bb9f8ccdbb43f9cd3d9a3c36a769b8e46777d694539b5" # 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