diff --git a/.circleci/config.yml b/.circleci/config.yml index 27da00e02..2c8713b19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,10 +9,10 @@ defaults: - image: 'quay.io/influxdb/telegraf-ci:1.10.8' go-1_11: &go-1_11 docker: - - image: 'quay.io/influxdb/telegraf-ci:1.11.10' + - image: 'quay.io/influxdb/telegraf-ci:1.11.13' go-1_12: &go-1_12 docker: - - image: 'quay.io/influxdb/telegraf-ci:1.12.5' + - image: 'quay.io/influxdb/telegraf-ci:1.12.9' version: 2 jobs: diff --git a/Makefile b/Makefile index 6c9717c5d..3c0fb3952 100644 --- a/Makefile +++ b/Makefile @@ -131,20 +131,15 @@ plugin-%: .PHONY: ci-1.12 ci-1.12: - docker build -t quay.io/influxdb/telegraf-ci:1.12.5 - < scripts/ci-1.12.docker - docker push quay.io/influxdb/telegraf-ci:1.12.5 + docker build -t quay.io/influxdb/telegraf-ci:1.12.9 - < scripts/ci-1.12.docker + docker push quay.io/influxdb/telegraf-ci:1.12.9 .PHONY: ci-1.11 ci-1.11: - docker build -t quay.io/influxdb/telegraf-ci:1.11.10 - < scripts/ci-1.11.docker - docker push quay.io/influxdb/telegraf-ci:1.11.10 + docker build -t quay.io/influxdb/telegraf-ci:1.11.13 - < scripts/ci-1.11.docker + docker push quay.io/influxdb/telegraf-ci:1.11.13 .PHONY: ci-1.10 ci-1.10: docker build -t quay.io/influxdb/telegraf-ci:1.10.8 - < scripts/ci-1.10.docker docker push quay.io/influxdb/telegraf-ci:1.10.8 - -.PHONY: ci-1.9 -ci-1.9: - docker build -t quay.io/influxdb/telegraf-ci:1.9.7 - < scripts/ci-1.9.docker - docker push quay.io/influxdb/telegraf-ci:1.9.7 diff --git a/appveyor.yml b/appveyor.yml index 46dcf97ba..c2349dd32 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,11 +13,11 @@ platform: x64 install: - IF NOT EXIST "C:\Cache" mkdir C:\Cache - - IF NOT EXIST "C:\Cache\go1.12.5.msi" curl -o "C:\Cache\go1.12.5.msi" https://storage.googleapis.com/golang/go1.12.5.windows-amd64.msi + - IF NOT EXIST "C:\Cache\go1.12.9.msi" curl -o "C:\Cache\go1.12.9.msi" https://storage.googleapis.com/golang/go1.12.9.windows-amd64.msi - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip - IF EXIST "C:\Go" rmdir /S /Q C:\Go - - msiexec.exe /i "C:\Cache\go1.12.5.msi" /quiet + - msiexec.exe /i "C:\Cache\go1.12.9.msi" /quiet - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y - go get -d github.com/golang/dep diff --git a/scripts/ci-1.11.docker b/scripts/ci-1.11.docker index 5e4cb5662..93f2d64b6 100644 --- a/scripts/ci-1.11.docker +++ b/scripts/ci-1.11.docker @@ -1,4 +1,4 @@ -FROM golang:1.11.10 +FROM golang:1.11.13 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/ci-1.12.docker b/scripts/ci-1.12.docker index 760c50a44..f5b093413 100644 --- a/scripts/ci-1.12.docker +++ b/scripts/ci-1.12.docker @@ -1,4 +1,4 @@ -FROM golang:1.12.5 +FROM golang:1.12.9 RUN chmod -R 755 "$GOPATH"