From 9a5fd6588c75095f032881b4b168dc4d346a60ae Mon Sep 17 00:00:00 2001 From: Steven Soroka Date: Tue, 14 Jul 2020 20:21:02 -0400 Subject: [PATCH] update go versions: 1.14.5, 1.13.13 (#7837) --- .circleci/config.yml | 11 +++++++++-- CHANGELOG.md | 2 +- Makefile | 8 ++++---- scripts/alpine.docker | 2 +- scripts/ci-1.13.docker | 2 +- scripts/ci-1.14.docker | 2 +- scripts/stretch.docker | 2 +- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 804c9b51bc269..dad9a5e0d1a38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,10 +6,10 @@ defaults: GOFLAGS: -p=8 go-1_13: &go-1_13 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 docker: - - image: 'quay.io/influxdb/telegraf-ci:1.14.4' + - image: 'quay.io/influxdb/telegraf-ci:1.14.5' mac: &mac macos: xcode: 11.3.1 @@ -176,12 +176,14 @@ workflows: only: /.*/ - 'package': requires: + - 'test-go-darwin' - 'test-go-1.13' - 'test-go-1.13-386' - 'test-go-1.14' - 'test-go-1.14-386' - 'release': requires: + - 'test-go-darwin' - 'test-go-1.13' - 'test-go-1.13-386' - 'test-go-1.14' @@ -194,6 +196,7 @@ workflows: nightly: jobs: - 'deps' + - 'macdeps' - 'test-go-1.13': requires: - 'deps' @@ -206,8 +209,12 @@ workflows: - 'test-go-1.14-386': requires: - 'deps' + - 'test-go-darwin': + requires: + - 'macdeps' - 'nightly': requires: + - 'test-go-darwin' - 'test-go-1.13' - 'test-go-1.13-386' - 'test-go-1.14' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c584b9a092af..eb63ddeae002f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ - Telegraf's `--test` mode now runs processors and aggregators before printing 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 telegraf.conf file, instead the new version will be installed to diff --git a/Makefile b/Makefile index d904ba8145939..7347e77724083 100644 --- a/Makefile +++ b/Makefile @@ -172,13 +172,13 @@ plugin-%: .PHONY: ci-1.14 ci-1.14: - docker build -t quay.io/influxdb/telegraf-ci:1.14.3 - < scripts/ci-1.14.docker - docker push quay.io/influxdb/telegraf-ci:1.14.3 + 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.5 .PHONY: ci-1.13 ci-1.13: - docker build -t quay.io/influxdb/telegraf-ci:1.13.11 - < scripts/ci-1.13.docker - docker push quay.io/influxdb/telegraf-ci:1.13.11 + 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.13 .PHONY: install install: $(buildbin) diff --git a/scripts/alpine.docker b/scripts/alpine.docker index 8eb86b39d61ce..35083e5a30f41 100644 --- a/scripts/alpine.docker +++ b/scripts/alpine.docker @@ -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 COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/ci-1.13.docker b/scripts/ci-1.13.docker index 1a5204a151915..6f175a1215429 100644 --- a/scripts/ci-1.13.docker +++ b/scripts/ci-1.13.docker @@ -1,4 +1,4 @@ -FROM golang:1.13.12 +FROM golang:1.13.13 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/ci-1.14.docker b/scripts/ci-1.14.docker index 61607b07f6647..8f7a0fd449bd0 100644 --- a/scripts/ci-1.14.docker +++ b/scripts/ci-1.14.docker @@ -1,4 +1,4 @@ -FROM golang:1.14.4 +FROM golang:1.14.5 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/stretch.docker b/scripts/stretch.docker index 805786075816c..7dbd02683e967 100644 --- a/scripts/stretch.docker +++ b/scripts/stretch.docker @@ -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 COPY . /go/src/github.com/influxdata/telegraf