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.

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 go from v1.18.1 to v1.18.3 #11248

Merged
merged 1 commit into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.18.1'
- image: 'quay.io/influxdb/telegraf-ci:1.18.3'
environment:
GOFLAGS: -p=4
mac:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ plugin-%:

.PHONY: ci
ci:
docker build -t quay.io/influxdb/telegraf-ci:1.18.1 - < scripts/ci.docker
docker push quay.io/influxdb/telegraf-ci:1.18.1
docker build -t quay.io/influxdb/telegraf-ci:1.18.3 - < scripts/ci.docker
docker push quay.io/influxdb/telegraf-ci:1.18.3

.PHONY: install
install: $(buildbin)
Expand Down
2 changes: 1 addition & 1 deletion docs/developers/PACKAGING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Telegraf will be built using the latest version of Go whenever possible.
Incrementing the version is maintained by the core Telegraf team because it requires access to an internal docker repository that hosts the docker CI images. When a new version is released, the following process is followed:

1. Within the `Makefile` and `.circleci\config.yml` update the Go versions to the new version number
2. Run `make ci-<latest version>` where `<latest version>` refers to the new Go version number (this requires internal permissions)
2. Run `make ci`, this requires quay.io internal permissions
3. The files `scripts\installgo_mac.sh` and `scripts\installgo_windows.sh` need to be updated as well with the new Go version and SHA
4. Create a pull request with these new changes, and verify the CI passes and uses the new docker image

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci.docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18.1
FROM golang:1.18.3

RUN chmod -R 755 "$GOPATH"

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

ARCH=$(uname -m)
GO_VERSION="1.18.1"
GO_VERSION="1.18.3"
if [ "$ARCH" = 'arm64' ]; then
GO_ARCH="darwin-arm64"
GO_VERSION_SHA="6d5641a06edba8cd6d425fb0adad06bad80e2afe0fa91b4aa0e5aed1bc78f58e" # from https://golang.org/dl
GO_VERSION_SHA="40ecd383c941cc9f0682e6a6f2a333539d58c7dea15c842434d03afafe2f7242" # from https://golang.org/dl
elif [ "$ARCH" = 'x86_64' ]; then
GO_ARCH="darwin-amd64"
GO_VERSION_SHA="3703e9a0db1000f18c0c7b524f3d378aac71219b4715a6a4c5683eb639f41a4d" # from https://golang.org/dl
GO_VERSION_SHA="d9dcf8fc35da54c6f259be41954783a9f4984945a855d03a003a7fd6ea4c5ca1" # 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eux

GO_VERSION="1.18.1"
GO_VERSION="1.18.3"

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