Commit 5082b66e by Carl Bergquist Committed by GitHub

Merge pull request #15078 from grafana/golang_1.11.5

upgrade golang to 1.11.5
parents 01984848 d75f53e8
...@@ -19,7 +19,7 @@ version: 2 ...@@ -19,7 +19,7 @@ version: 2
jobs: jobs:
mysql-integration-test: mysql-integration-test:
docker: docker:
- image: circleci/golang:1.11.4 - image: circleci/golang:1.11.5
- image: circleci/mysql:5.6-ram - image: circleci/mysql:5.6-ram
environment: environment:
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
...@@ -39,7 +39,7 @@ jobs: ...@@ -39,7 +39,7 @@ jobs:
postgres-integration-test: postgres-integration-test:
docker: docker:
- image: circleci/golang:1.11.4 - image: circleci/golang:1.11.5
- image: circleci/postgres:9.3-ram - image: circleci/postgres:9.3-ram
environment: environment:
POSTGRES_USER: grafanatest POSTGRES_USER: grafanatest
...@@ -74,7 +74,7 @@ jobs: ...@@ -74,7 +74,7 @@ jobs:
gometalinter: gometalinter:
docker: docker:
- image: circleci/golang:1.11.4 - image: circleci/golang:1.11.5
environment: environment:
# we need CGO because of go-sqlite3 # we need CGO because of go-sqlite3
CGO_ENABLED: 1 CGO_ENABLED: 1
...@@ -106,7 +106,7 @@ jobs: ...@@ -106,7 +106,7 @@ jobs:
test-backend: test-backend:
docker: docker:
- image: circleci/golang:1.11.4 - image: circleci/golang:1.11.5
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -116,7 +116,7 @@ jobs: ...@@ -116,7 +116,7 @@ jobs:
build-all: build-all:
docker: docker:
- image: grafana/build-container:1.2.2 - image: grafana/build-container:1.2.3
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -164,7 +164,7 @@ jobs: ...@@ -164,7 +164,7 @@ jobs:
build: build:
docker: docker:
- image: grafana/build-container:1.2.2 - image: grafana/build-container:1.2.3
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -233,7 +233,7 @@ jobs: ...@@ -233,7 +233,7 @@ jobs:
build-enterprise: build-enterprise:
docker: docker:
- image: grafana/build-container:1.2.2 - image: grafana/build-container:1.2.3
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -265,7 +265,7 @@ jobs: ...@@ -265,7 +265,7 @@ jobs:
build-all-enterprise: build-all-enterprise:
docker: docker:
- image: grafana/build-container:1.2.2 - image: grafana/build-container:1.2.3
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
......
# Golang build container # Golang build container
FROM golang:1.11.4 FROM golang:1.11.5
WORKDIR $GOPATH/src/github.com/grafana/grafana WORKDIR $GOPATH/src/github.com/grafana/grafana
......
...@@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana ...@@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
environment: environment:
nodejs_version: "8" nodejs_version: "8"
GOPATH: C:\gopath GOPATH: C:\gopath
GOVERSION: 1.11.4 GOVERSION: 1.11.5
install: install:
- rmdir c:\go /s /q - rmdir c:\go /s /q
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment