update go versions: 1.14.5, 1.13.13 (influxdata#7837)

arstercz · Jul 15, 2020 · d730956 · d730956
1 parent 9d3b5e8
commit d730956
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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