chore: Update to go1.18.5 (#11621)
This commit is contained in:
parent
fa811ed983
commit
c55ab71a15
|
|
@ -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.4'
|
- image: 'quay.io/influxdb/telegraf-ci:1.18.5'
|
||||||
environment:
|
environment:
|
||||||
GOFLAGS: -p=4
|
GOFLAGS: -p=4
|
||||||
mac:
|
mac:
|
||||||
|
|
|
||||||
4
Makefile
4
Makefile
|
|
@ -239,8 +239,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.4 - < scripts/ci.docker
|
docker build -t quay.io/influxdb/telegraf-ci:1.18.5 - < scripts/ci.docker
|
||||||
docker push quay.io/influxdb/telegraf-ci:1.18.4
|
docker push quay.io/influxdb/telegraf-ci:1.18.5
|
||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: $(buildbin)
|
install: $(buildbin)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.18.4
|
FROM golang:1.18.5
|
||||||
|
|
||||||
RUN chmod -R 755 "$GOPATH"
|
RUN chmod -R 755 "$GOPATH"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
GO_VERSION="1.18.4"
|
GO_VERSION="1.18.5"
|
||||||
GO_ARCH="linux-amd64"
|
GO_ARCH="linux-amd64"
|
||||||
# from https://golang.org/dl
|
# from https://golang.org/dl
|
||||||
GO_VERSION_SHA="c9b099b68d93f5c5c8a8844a89f8db07eaa58270e3a1e01804f17f4cf8df02f5"
|
GO_VERSION_SHA="9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2"
|
||||||
|
|
||||||
# Download Go and verify Go tarball
|
# Download Go and verify Go tarball
|
||||||
setup_go () {
|
setup_go () {
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,13 @@
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
GO_VERSION="1.18.4"
|
GO_VERSION="1.18.5"
|
||||||
if [ "$ARCH" = 'arm64' ]; then
|
if [ "$ARCH" = 'arm64' ]; then
|
||||||
GO_ARCH="darwin-arm64"
|
GO_ARCH="darwin-arm64"
|
||||||
GO_VERSION_SHA="04eed623d5143ffa44965b618b509e0beccccfd3a4a1bfebc0cdbcf906046769" # from https://golang.org/dl
|
GO_VERSION_SHA="923a377c6fc9a2c789f5db61c24b8f64133f7889056897449891f256af34065f" # 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="315e1a2b21a827c68da1b7f492b5dcbe81d8df8a79ebe50922df9588893f87f0" # from https://golang.org/dl
|
GO_VERSION_SHA="828eeca8b5abea3e56921df8fa4b1101380a5ebcfee10acbc8ffe7ec0bf5876b" # 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,7 +2,7 @@
|
||||||
|
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
GO_VERSION="1.18.4"
|
GO_VERSION="1.18.5"
|
||||||
|
|
||||||
setup_go () {
|
setup_go () {
|
||||||
choco upgrade golang --allow-downgrade --version=${GO_VERSION}
|
choco upgrade golang --allow-downgrade --version=${GO_VERSION}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue