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

update go versions: 1.14.5, 1.13.13 (#7837)

This commit is contained in:
Steven Soroka 2020-07-14 20:21:02 -04:00 committed by GitHub
parent f9b4138758
commit 9a5fd6588c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.circleci/config.yml
View File

@ -6,10 +6,10 @@ defaults:
GOFLAGS: -p=8 GOFLAGS: -p=8
go-1_13: &go-1_13 go-1_13: &go-1_13
docker: docker:
- image: 'quay.io/influxdb/telegraf-ci:1.13.12' - image: 'quay.io/influxdb/telegraf-ci:1.13.13'
go-1_14: &go-1_14 go-1_14: &go-1_14
docker: docker:
- image: 'quay.io/influxdb/telegraf-ci:1.14.4' - image: 'quay.io/influxdb/telegraf-ci:1.14.5'
mac: &mac mac: &mac
macos: macos:
xcode: 11.3.1 xcode: 11.3.1
@ -176,12 +176,14 @@ workflows:
only: /.*/ only: /.*/
- 'package': - 'package':
requires: requires:
- 'test-go-darwin'
- 'test-go-1.13' - 'test-go-1.13'
- 'test-go-1.13-386' - 'test-go-1.13-386'
- 'test-go-1.14' - 'test-go-1.14'
- 'test-go-1.14-386' - 'test-go-1.14-386'
- 'release': - 'release':
requires: requires:
- 'test-go-darwin'
- 'test-go-1.13' - 'test-go-1.13'
- 'test-go-1.13-386' - 'test-go-1.13-386'
- 'test-go-1.14' - 'test-go-1.14'
@ -194,6 +196,7 @@ workflows:
nightly: nightly:
jobs: jobs:
- 'deps' - 'deps'
- 'macdeps'
- 'test-go-1.13': - 'test-go-1.13':
requires: requires:
- 'deps' - 'deps'
@ -206,8 +209,12 @@ workflows:
- 'test-go-1.14-386': - 'test-go-1.14-386':
requires: requires:
- 'deps' - 'deps'
- 'test-go-darwin':
requires:
- 'macdeps'
- 'nightly': - 'nightly':
requires: requires:
- 'test-go-darwin'
- 'test-go-1.13' - 'test-go-1.13'
- 'test-go-1.13-386' - 'test-go-1.13-386'
- 'test-go-1.14' - 'test-go-1.14'

2
CHANGELOG.md
View File

@ -15,7 +15,7 @@
- Telegraf's `--test` mode now runs processors and aggregators before printing - Telegraf's `--test` mode now runs processors and aggregators before printing
metrics. metrics.
- Official packages now built with Go 1.14.4. - Official packages now built with Go 1.14.5.
- When updating the Debian package you will no longer be prompted to merge the - When updating the Debian package you will no longer be prompted to merge the
telegraf.conf file, instead the new version will be installed to telegraf.conf file, instead the new version will be installed to

8
Makefile
View File

@ -172,13 +172,13 @@ plugin-%:
.PHONY: ci-1.14 .PHONY: ci-1.14
ci-1.14: ci-1.14:
docker build -t quay.io/influxdb/telegraf-ci:1.14.3 - < scripts/ci-1.14.docker docker build -t quay.io/influxdb/telegraf-ci:1.14.5 - < scripts/ci-1.14.docker
docker push quay.io/influxdb/telegraf-ci:1.14.3 docker push quay.io/influxdb/telegraf-ci:1.14.5
.PHONY: ci-1.13 .PHONY: ci-1.13
ci-1.13: ci-1.13:
docker build -t quay.io/influxdb/telegraf-ci:1.13.11 - < scripts/ci-1.13.docker docker build -t quay.io/influxdb/telegraf-ci:1.13.13 - < scripts/ci-1.13.docker
docker push quay.io/influxdb/telegraf-ci:1.13.11 docker push quay.io/influxdb/telegraf-ci:1.13.13
.PHONY: install .PHONY: install
install: $(buildbin) install: $(buildbin)

2
scripts/alpine.docker
View File

@ -1,4 +1,4 @@
FROM golang:1.13.8 as builder FROM golang:1.13.13 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.13.docker
View File

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

2
scripts/ci-1.14.docker
View File

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

2
scripts/stretch.docker
View File

@ -1,4 +1,4 @@
FROM golang:1.13.8 as builder FROM golang:1.13.13 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