dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to Go 1.12.9 and 1.11.13 (#6303)

This commit is contained in:
Daniel Nelson 2019-08-22 10:51:15 -07:00 committed by GitHub
parent b578586d4a
commit 1848adaf79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -9,10 +9,10 @@ defaults:
- image: 'quay.io/influxdb/telegraf-ci:1.10.8' - image: 'quay.io/influxdb/telegraf-ci:1.10.8'
go-1_11: &go-1_11 go-1_11: &go-1_11
docker: 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 go-1_12: &go-1_12
docker: docker:
- image: 'quay.io/influxdb/telegraf-ci:1.12.5' - image: 'quay.io/influxdb/telegraf-ci:1.12.9'
version: 2 version: 2
jobs: jobs:

13
Makefile
View File

@ -131,20 +131,15 @@ plugin-%:
.PHONY: ci-1.12 .PHONY: ci-1.12
ci-1.12: ci-1.12:
docker build -t quay.io/influxdb/telegraf-ci:1.12.5 - < scripts/ci-1.12.docker 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.5 docker push quay.io/influxdb/telegraf-ci:1.12.9
.PHONY: ci-1.11 .PHONY: ci-1.11
ci-1.11: ci-1.11:
docker build -t quay.io/influxdb/telegraf-ci:1.11.10 - < scripts/ci-1.11.docker 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.10 docker push quay.io/influxdb/telegraf-ci:1.11.13
.PHONY: ci-1.10 .PHONY: ci-1.10
ci-1.10: ci-1.10:
docker build -t quay.io/influxdb/telegraf-ci:1.10.8 - < scripts/ci-1.10.docker 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 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

4
appveyor.yml
View File

@ -13,11 +13,11 @@ platform: x64
install: install:
- IF NOT EXIST "C:\Cache" mkdir C:\Cache - 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-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 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 - 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-bin.zip" -oC:\GnuWin32 -y
- 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
- go get -d github.com/golang/dep - go get -d github.com/golang/dep

2
scripts/ci-1.11.docker
View File

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

2
scripts/ci-1.12.docker
View File

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