Skip to content

Commit

Permalink
upgrades to golang 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
bergquist committed Aug 25, 2018
1 parent 8a99fa2 commit fda9790
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ version: 2
jobs:
mysql-integration-test:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
- image: circleci/mysql:5.6-ram
environment:
MYSQL_ROOT_PASSWORD: rootpass
Expand All @@ -39,7 +39,7 @@ jobs:

postgres-integration-test:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
- image: circleci/postgres:9.3-ram
environment:
POSTGRES_USER: grafanatest
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

gometalinter:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
environment:
# we need CGO because of go-sqlite3
CGO_ENABLED: 1
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:

test-backend:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Golang build container
FROM golang:1.10
FROM golang:1.11

WORKDIR $GOPATH/src/github.com/grafana/grafana

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ the latest master builds [here](https://grafana.com/grafana/download)

### Dependencies

- Go 1.10
- Go 1.11
- NodeJS LTS

### Building the backend
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
environment:
nodejs_version: "6"
GOPATH: C:\gopath
GOVERSION: 1.10
GOVERSION: 1.11

install:
- rmdir c:\go /s /q
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/project/building_from_source.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple

## Dependencies

- [Go 1.10](https://golang.org/dl/)
- [Go 1.11](https://golang.org/dl/)
- [Git](https://git-scm.com/downloads)
- [NodeJS LTS](https://nodejs.org/download/)
- node-gyp is the Node.js native addon build tool and it requires extra dependencies: python 2.7, make and GCC. These are already installed for most Linux distros and MacOS. See the Building On Windows section or the [node-gyp installation instructions](https://github.com/nodejs/node-gyp#installation) for more details.
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380
RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
yum install -y nodejs --nogpgcheck

ENV GOLANG_VERSION 1.10
ENV GOLANG_VERSION 1.11

RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
yum install -y yarn --nogpgcheck && \
Expand Down

0 comments on commit fda9790

Please sign in to comment.