CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update to go1.18.4 (#11526)

This commit is contained in:
Joshua Powers 2022-07-20 07:28:41 -06:00 committed by GitHub
parent cff5c0e852
commit e2c2f29f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -8,7 +8,7 @@ executors:
working_directory: '/go/src/github.com/influxdata/telegraf' working_directory: '/go/src/github.com/influxdata/telegraf'
resource_class: large resource_class: large
docker: docker:
- image: 'quay.io/influxdb/telegraf-ci:1.18.3' - image: 'quay.io/influxdb/telegraf-ci:1.18.4'
environment: environment:
GOFLAGS: -p=4 GOFLAGS: -p=4
mac: mac:

4
Makefile
View File

@ -237,8 +237,8 @@ plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
.PHONY: ci .PHONY: ci
ci: ci:
docker build -t quay.io/influxdb/telegraf-ci:1.18.3 - < scripts/ci.docker docker build -t quay.io/influxdb/telegraf-ci:1.18.4 - < scripts/ci.docker
docker push quay.io/influxdb/telegraf-ci:1.18.3 docker push quay.io/influxdb/telegraf-ci:1.18.4
.PHONY: install .PHONY: install
install: $(buildbin) install: $(buildbin)

10
docs/developers/PACKAGING.md
View File

@ -12,10 +12,14 @@ 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: 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 1. Within the `Makefile`, `.circleci\config.yml`, and `scripts/ci.docker` files
update the Go versions to the new version number
2. Run `make ci`, this requires quay.io internal permissions 2. Run `make ci`, this requires quay.io internal permissions
3. The files `scripts\installgo_linux.sh`, `scripts\installgo_mac.sh`, and `scripts\installgo_windows.sh` need to be updated as well with the new Go version and SHA 3. The files `scripts\installgo_linux.sh`, `scripts\installgo_mac.sh`, and
4. Create a pull request with these new changes, and verify the CI passes and uses the new docker image `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
See the [previous PRs](https://github.com/influxdata/telegraf/search?q=chore+update+go&type=commits) as examples. See the [previous PRs](https://github.com/influxdata/telegraf/search?q=chore+update+go&type=commits) as examples.

2
scripts/ci.docker
View File

@ -1,4 +1,4 @@
FROM golang:1.18.3 FROM golang:1.18.4
RUN chmod -R 755 "$GOPATH" RUN chmod -R 755 "$GOPATH"

4
scripts/installgo_linux.sh
View File

@ -2,10 +2,10 @@
set -eux set -eux
GO_VERSION="1.18.3" GO_VERSION="1.18.4"
GO_ARCH="linux-amd64" GO_ARCH="linux-amd64"
# from https://golang.org/dl # from https://golang.org/dl
GO_VERSION_SHA="956f8507b302ab0bb747613695cdae10af99bbd39a90cae522b7c0302cc27245" GO_VERSION_SHA="c9b099b68d93f5c5c8a8844a89f8db07eaa58270e3a1e01804f17f4cf8df02f5"
# Download Go and verify Go tarball # Download Go and verify Go tarball
setup_go () { setup_go () {

6
scripts/installgo_mac.sh
View File

@ -3,13 +3,13 @@
set -eux set -eux
ARCH=$(uname -m) ARCH=$(uname -m)
GO_VERSION="1.18.3" GO_VERSION="1.18.4"
if [ "$ARCH" = 'arm64' ]; then if [ "$ARCH" = 'arm64' ]; then
GO_ARCH="darwin-arm64" GO_ARCH="darwin-arm64"
GO_VERSION_SHA="40ecd383c941cc9f0682e6a6f2a333539d58c7dea15c842434d03afafe2f7242" # from https://golang.org/dl GO_VERSION_SHA="04eed623d5143ffa44965b618b509e0beccccfd3a4a1bfebc0cdbcf906046769" # from https://golang.org/dl
elif [ "$ARCH" = 'x86_64' ]; then elif [ "$ARCH" = 'x86_64' ]; then
GO_ARCH="darwin-amd64" GO_ARCH="darwin-amd64"
GO_VERSION_SHA="d9dcf8fc35da54c6f259be41954783a9f4984945a855d03a003a7fd6ea4c5ca1" # from https://golang.org/dl GO_VERSION_SHA="315e1a2b21a827c68da1b7f492b5dcbe81d8df8a79ebe50922df9588893f87f0" # from https://golang.org/dl
fi fi
# This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.)

2
scripts/installgo_windows.sh
View File

@ -2,7 +2,7 @@
set -eux set -eux
GO_VERSION="1.18.3" GO_VERSION="1.18.4"
setup_go () { setup_go () {
choco upgrade golang --allow-downgrade --version=${GO_VERSION} choco upgrade golang --allow-downgrade --version=${GO_VERSION}