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

chore: update CI go to 1.17.6 #10611

Merged
merged 2 commits into from
Feb 9, 2022
Merged

chore: update CI go to 1.17.6 #10611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f5a8f
chore: update CI go to 1.17.6
powersj Feb 9, 2022
432c53c
use darwin sha, not linux
powersj Feb 9, 2022
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ executors:
working_directory: '/go/src/github.com/influxdata/telegraf'
resource_class: large
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.17.5'
- image: 'quay.io/influxdb/telegraf-ci:1.17.6'
environment:
GOFLAGS: -p=4
mac:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ plugin-%:

.PHONY: ci-1.17
ci-1.17:
docker build -t quay.io/influxdb/telegraf-ci:1.17.5 - < scripts/ci-1.17.docker
docker push quay.io/influxdb/telegraf-ci:1.17.5
docker build -t quay.io/influxdb/telegraf-ci:1.17.6 - < scripts/ci-1.17.docker
docker push quay.io/influxdb/telegraf-ci:1.17.6

.PHONY: install
install: $(buildbin)
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-1.17.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17.5
FROM golang:1.17.6

RUN chmod -R 755 "$GOPATH"

Expand Down
6 changes: 3 additions & 3 deletions scripts/installgo_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
set -eux

ARCH=$(uname -m)
GO_VERSION="1.17.5"
GO_VERSION="1.17.6"
if [ "$ARCH" = 'arm64' ]; then
GO_ARCH="darwin-arm64"
GO_VERSION_SHA="111f71166de0cb8089bb3e8f9f5b02d76e1bf1309256824d4062a47b0e5f98e0" # from https://golang.org/dl
GO_VERSION_SHA="dc54f3f4099e2be9e9c33bf926a7dc3ad64f34717142f7abcaff9ae44bc03d0c" # from https://golang.org/dl
elif [ "$ARCH" = 'x86_64' ]; then
GO_ARCH="darwin-amd64"
GO_VERSION_SHA="2db6a5d25815b56072465a2cacc8ed426c18f1d5fc26c1fc8c4f5a7188658264" # from https://golang.org/dl
GO_VERSION_SHA="874bc6f95e07697380069a394a21e05576a18d60f4ba178646e1ebed8f8b1f89" # from https://golang.org/dl
fi

# This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.)
Expand Down
2 changes: 1 addition & 1 deletion scripts/installgo_windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eux

GO_VERSION="1.17.5"
GO_VERSION="1.17.6"

setup_go () {
choco upgrade golang --version=${GO_VERSION}
Expand Down