IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

upgrades to golang 1.11

Browse Source
This commit is contained in:
bergquist 2018-08-25 21:23:20 +02:00
parent 8a99fa269d
commit fda9790ba5
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -19,7 +19,7 @@ version: 2
jobs: jobs:
mysql-integration-test: mysql-integration-test:
docker: docker:
- image: circleci/golang:1.10 - image: circleci/golang:1.11
- 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:
postgres-integration-test: postgres-integration-test:
docker: docker:
- image: circleci/golang:1.10 - image: circleci/golang:1.11
- 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:
gometalinter: gometalinter:
docker: docker:
- image: circleci/golang:1.10 - image: circleci/golang:1.11
environment: environment:
# we need CGO because of go-sqlite3 # we need CGO because of go-sqlite3
CGO_ENABLED: 1 CGO_ENABLED: 1
@ -115,7 +115,7 @@ jobs:
test-backend: test-backend:
docker: docker:
- image: circleci/golang:1.10 - image: circleci/golang:1.11
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout

2
Dockerfile
View File

@ -1,5 +1,5 @@
# Golang build container # Golang build container
FROM golang:1.10 FROM golang:1.11
WORKDIR $GOPATH/src/github.com/grafana/grafana WORKDIR $GOPATH/src/github.com/grafana/grafana

2
README.md
View File

@ -24,7 +24,7 @@ the latest master builds [here](https://grafana.com/grafana/download)
### Dependencies ### Dependencies
- Go 1.10 - Go 1.11
- NodeJS LTS - NodeJS LTS
### Building the backend ### Building the backend

2
appveyor.yml
View File

@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
environment: environment:
nodejs_version: "6" nodejs_version: "6"
GOPATH: C:\gopath GOPATH: C:\gopath
GOVERSION: 1.10 GOVERSION: 1.11
install: install:
- rmdir c:\go /s /q - rmdir c:\go /s /q

2
docs/sources/project/building_from_source.md
View File

@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple
## Dependencies ## Dependencies
- [Go 1.10](https://golang.org/dl/) - [Go 1.11](https://golang.org/dl/)
- [Git](https://git-scm.com/downloads) - [Git](https://git-scm.com/downloads)
- [NodeJS LTS](https://nodejs.org/download/) - [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. - 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.

2
scripts/build/Dockerfile
View File

@ -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 - && \ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
yum install -y nodejs --nogpgcheck 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 && \ RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
yum install -y yarn --nogpgcheck && \ yum install -y yarn --nogpgcheck && \