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

Update Go to 1.16.5 (#9331)

This commit is contained in:
Sebastian Spaink 2021-06-07 19:19:22 -05:00 committed by GitHub
parent 32b963a4c6
commit 7a987306e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -13,7 +13,7 @@ executors:
go-1_16: go-1_16:
working_directory: '/go/src/github.com/influxdata/telegraf' working_directory: '/go/src/github.com/influxdata/telegraf'
docker: docker:
- image: 'quay.io/influxdb/telegraf-ci:1.16.2' - image: 'quay.io/influxdb/telegraf-ci:1.16.5'
environment: environment:
GOFLAGS: -p=8 GOFLAGS: -p=8
mac: mac:
@ -150,7 +150,7 @@ jobs:
steps: steps:
- checkout - checkout
- check-changed-files-or-halt-windows - check-changed-files-or-halt-windows
- run: choco upgrade golang --version=1.16.2 - run: choco upgrade golang --version=1.16.5
- run: choco install make - run: choco install make
- run: git config --system core.longpaths true - run: git config --system core.longpaths true
- run: make test-windows - run: make test-windows

6
Makefile
View File

@ -161,7 +161,7 @@ tidy:
go mod verify go mod verify
go mod tidy go mod tidy
@if ! git diff --quiet go.mod go.sum; then \ @if ! git diff --quiet go.mod go.sum; then \
echo "please run go mod tidy and check in changes"; \ echo "please run go mod tidy and check in changes, you might have to use the same version of Go as the CI"; \
exit 1; \ exit 1; \
fi fi
@ -201,8 +201,8 @@ ci-1.15:
.PHONY: ci-1.16 .PHONY: ci-1.16
ci-1.16: ci-1.16:
docker build -t quay.io/influxdb/telegraf-ci:1.16.2 - < scripts/ci-1.16.docker 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.2 docker push quay.io/influxdb/telegraf-ci:1.16.5
.PHONY: install .PHONY: install
install: $(buildbin) install: $(buildbin)

2
scripts/alpine.docker
View File

@ -1,4 +1,4 @@
FROM golang:1.16.2 as builder FROM golang:1.16.5 as builder
WORKDIR /go/src/github.com/influxdata/telegraf WORKDIR /go/src/github.com/influxdata/telegraf
COPY . /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf

2
scripts/buster.docker
View File

@ -1,4 +1,4 @@
FROM golang:1.16.2-buster as builder FROM golang:1.16.5-buster as builder
WORKDIR /go/src/github.com/influxdata/telegraf WORKDIR /go/src/github.com/influxdata/telegraf
COPY . /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf

2
scripts/ci-1.16.docker
View File

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

2
scripts/mac_installgo.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
version="1.16.2" version="1.16.5"
# This path is cachable, while saving directly in /usr/local/ will cause issues restoring the cache # This path is cachable, while saving directly in /usr/local/ will cause issues restoring the cache
path="/usr/local/Cellar" path="/usr/local/Cellar"