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

46
.circleci/config.yml
View File

@ -1,6 +1,6 @@
version: 2.1 version: 2.1
orbs: orbs:
win: circleci/windows@2.4.0 win: circleci/windows@2.4.0
aws-cli: circleci/aws-cli@1.4.0 aws-cli: circleci/aws-cli@1.4.0
executors: executors:
@ -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:
@ -30,7 +30,7 @@ commands:
- run: ./scripts/check-file-changes.sh - run: ./scripts/check-file-changes.sh
check-changed-files-or-halt-windows: check-changed-files-or-halt-windows:
steps: steps:
- run: - run:
command: ./scripts/check-file-changes.sh command: ./scripts/check-file-changes.sh
shell: bash.exe shell: bash.exe
test-go: test-go:
@ -65,11 +65,11 @@ commands:
at: '/go' at: '/go'
- when: - when:
condition: << parameters.release >> condition: << parameters.release >>
steps: steps:
- run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 make package' - run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 make package'
- when: - when:
condition: << parameters.nightly >> condition: << parameters.nightly >>
steps: steps:
- run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 NIGHTLY=1 make package' - run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 NIGHTLY=1 make package'
- run: 'make upload-nightly' - run: 'make upload-nightly'
- unless: - unless:
@ -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
@ -283,14 +283,14 @@ jobs:
command: | command: |
echo "Go tests complete." echo "Go tests complete."
share-artifacts: share-artifacts:
executor: aws-cli/default executor: aws-cli/default
steps: steps:
- run: - run:
command: | command: |
PR=${CIRCLE_PULL_REQUEST##*/} PR=${CIRCLE_PULL_REQUEST##*/}
printf -v payload '{ "pullRequestNumber": "%s" }' "$PR" printf -v payload '{ "pullRequestNumber": "%s" }' "$PR"
curl -X POST "https://182c7jdgog.execute-api.us-east-1.amazonaws.com/prod/shareArtifacts" --data "$payload" curl -X POST "https://182c7jdgog.execute-api.us-east-1.amazonaws.com/prod/shareArtifacts" --data "$payload"
workflows: workflows:
version: 2 version: 2
check: check:
@ -331,47 +331,47 @@ workflows:
filters: filters:
tags: tags:
only: /.*/ only: /.*/
- 'test-awaiter': - 'test-awaiter':
requires: requires:
- 'test-go-1_15' - 'test-go-1_15'
- 'test-go-1_15-386' - 'test-go-1_15-386'
- 'test-go-1_16' - 'test-go-1_16'
- 'test-go-1_16-386' - 'test-go-1_16-386'
- 'windows-package': - 'windows-package':
requires: requires:
- 'test-go-windows' - 'test-go-windows'
- 'darwin-package': - 'darwin-package':
requires: requires:
- 'test-go-mac' - 'test-go-mac'
- 'i386-package': - 'i386-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'ppc641e-package': - 'ppc641e-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 's390x-package': - 's390x-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'armel-package': - 'armel-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'amd64-package': - 'amd64-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'arm64-package': - 'arm64-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'armhf-package': - 'armhf-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'static-package': - 'static-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'mipsel-package': - 'mipsel-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'mips-package': - 'mips-package':
requires: requires:
- 'test-awaiter' - 'test-awaiter'
- 'share-artifacts': - 'share-artifacts':
requires: requires:
@ -412,7 +412,7 @@ workflows:
only: /.*/ only: /.*/
- 'package-sign-mac': - 'package-sign-mac':
requires: requires:
- 'package-sign-windows' - 'package-sign-windows'
filters: filters:
tags: tags:
only: /.*/ only: /.*/
@ -448,4 +448,4 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - master

10
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)
@ -251,7 +251,7 @@ debs += telegraf_$(deb_version)_amd64.deb
rpms += telegraf-$(rpm_version).x86_64.rpm rpms += telegraf-$(rpm_version).x86_64.rpm
endif endif
ifdef static ifdef static
tars += telegraf-$(tar_version)_static_linux_amd64.tar.gz tars += telegraf-$(tar_version)_static_linux_amd64.tar.gz
endif endif
@ -266,7 +266,7 @@ tars += telegraf-$(tar_version)_linux_armhf.tar.gz
tars += telegraf-$(tar_version)_freebsd_armv7.tar.gz tars += telegraf-$(tar_version)_freebsd_armv7.tar.gz
debs += telegraf_$(deb_version)_armhf.deb debs += telegraf_$(deb_version)_armhf.deb
rpms += telegraf-$(rpm_version).armv6hl.rpm rpms += telegraf-$(rpm_version).armv6hl.rpm
endif endif
ifdef s390x ifdef s390x
tars += telegraf-$(tar_version)_linux_s390x.tar.gz tars += telegraf-$(tar_version)_linux_s390x.tar.gz

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"