Skip to content

Commit

Permalink
Build with Go 1.13.3 and 1.12.12 (influxdata#6565)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielnelson authored Oct 22, 2019
1 parent 82a8057 commit d2f3215
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ defaults:
GOFLAGS: -p=8
go-1_12: &go-1_12
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.12.10'
- image: 'quay.io/influxdb/telegraf-ci:1.12.12'
go-1_13: &go-1_13
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.13.1'
- image: 'quay.io/influxdb/telegraf-ci:1.13.3'

version: 2
jobs:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ plugin-%:

.PHONY: ci-1.13
ci-1.13:
docker build -t quay.io/influxdb/telegraf-ci:1.13.1 - < scripts/ci-1.13.docker
docker push quay.io/influxdb/telegraf-ci:1.13.1
docker build -t quay.io/influxdb/telegraf-ci:1.13.3 - < scripts/ci-1.13.docker
docker push quay.io/influxdb/telegraf-ci:1.13.3

.PHONY: ci-1.12
ci-1.12:
docker build -t quay.io/influxdb/telegraf-ci:1.12.10 - < scripts/ci-1.12.docker
docker push quay.io/influxdb/telegraf-ci:1.12.10
docker build -t quay.io/influxdb/telegraf-ci:1.12.12 - < scripts/ci-1.12.docker
docker push quay.io/influxdb/telegraf-ci:1.12.12
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ platform: x64

install:
- IF NOT EXIST "C:\Cache" mkdir C:\Cache
- IF NOT EXIST "C:\Cache\go1.13.1.msi" curl -o "C:\Cache\go1.13.1.msi" https://storage.googleapis.com/golang/go1.13.1.windows-amd64.msi
- IF NOT EXIST "C:\Cache\go1.13.3.msi" curl -o "C:\Cache\go1.13.3.msi" https://storage.googleapis.com/golang/go1.13.3.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.13.1.msi" /quiet
- msiexec.exe /i "C:\Cache\go1.13.3.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
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-1.12.docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.10
FROM golang:1.12.12

RUN chmod -R 755 "$GOPATH"

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-1.13.docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.1
FROM golang:1.13.3

RUN chmod -R 755 "$GOPATH"

Expand Down

0 comments on commit d2f3215

Please sign in to comment.