ci: use go1.12 on CircleCI

And update go.sum from a go1.12 mod tidy.
pull/13376/head
Mark Rushakoff 2019-01-22 11:45:57 -08:00 committed by Mark Rushakoff
parent 70100b2f98
commit 3507027dc0
2 changed files with 7 additions and 11 deletions

View File

@ -39,7 +39,7 @@ jobs:
path: ~/project
e2e:
docker:
- image: circleci/golang:1.11-node-browsers
- image: circleci/golang:1.12-node-browsers
environment:
GOCACHE: /tmp/go-cache
GOFLAGS: '-mod=readonly -p=4' # Go on Circle thinks 32 CPUs are available, but there aren't.
@ -74,7 +74,7 @@ jobs:
destination: screenshots
jstest:
docker:
- image: circleci/golang:1.11-node-browsers
- image: circleci/golang:1.12-node-browsers
working_directory: /go/src/github.com/influxdata/influxdb
steps:
- checkout
@ -84,7 +84,7 @@ jobs:
gotest:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12
environment:
GOCACHE: /tmp/go-cache
GOFLAGS: '-mod=readonly -p=2' # Go on Circle thinks 32 CPUs are available, but there aren't.
@ -115,11 +115,6 @@ jobs:
- run: GO111MODULE=on go mod vendor # staticcheck looks in vendor for dependencies.
- run: GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck # Install staticcheck from the version we specify in go.mod.
- run: staticcheck ./...
# In go1.11, running go mod vendor when go.mod contains replace entries, "taints" go.sum, even with -mod=readonly.
# See https://github.com/golang/go/issues/27868.
# Clean up go.sum so that we save to the same module key we attempted to restore from.
# TODO: remove this call to git checkout after we are on go1.12.
- run: git checkout -- go.sum
- save_cache:
name: Saving GOCACHE
@ -136,7 +131,7 @@ jobs:
build:
docker:
- image: circleci/golang:1.11-node-browsers
- image: circleci/golang:1.12-node-browsers
environment:
GOCACHE: /tmp/go-cache
GOFLAGS: '-mod=readonly -p=4' # Go on Circle thinks 32 CPUs are available, but there aren't.
@ -167,7 +162,7 @@ jobs:
deploy-nightly:
docker:
- image: circleci/golang:1.11-node-browsers
- image: circleci/golang:1.12-node-browsers
environment:
GOCACHE: /tmp/go-cache
GOFLAGS: '-mod=readonly -p=4' # Go on Circle thinks 32 CPUs are available, but there aren't.
@ -199,7 +194,7 @@ jobs:
release:
docker:
- image: circleci/golang:1.11-node-browsers
- image: circleci/golang:1.12-node-browsers
environment:
GOCACHE: /tmp/go-cache
GOFLAGS: '-mod=readonly -p=4' # Go on Circle thinks 32 CPUs are available, but there aren't.

1
go.sum
View File

@ -227,6 +227,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/flux v0.25.0 h1:ZYegi5UMI6jUnXg5MqH+j4OvIvMMlHMc+PVd2pdQd2E=
github.com/influxdata/flux v0.25.0/go.mod h1:0f5Yrm4VPSd/Ne6jIVOVtPo0MFe6jpLCr6vdaZYp7wY=
github.com/influxdata/goreleaser v0.97.0-influx h1:jT5OrcW7WfS0e2QxfwmTBjhLvpIC9CDLRhNgZJyhj8s=
github.com/influxdata/goreleaser v0.97.0-influx/go.mod h1:MnjA0e0Uq6ISqjG1WxxMAl+3VS1QYjILSWVnMYDxasE=
github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 h1:CFx+pP90q/qg3spoiZjf8donE4WpAdjeJfPOcoNqkWo=
github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo=