Skip to content

N
nexpie-grafana-theme
Commit 91342514 by Carl Bergquist Committed by GitHub
Options

build: upgrades to golang 1.12.4 (#16545) 

fix govet issue in golang 1.12.4
parent 15383510
Showing with 28 additions and 14 deletions
.circleci/config.yml
...@@ -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.5 - image: circleci/golang:1.12.4
- 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.5 - image: circleci/golang:1.12.4
- image: circleci/postgres:9.3-ram - image: circleci/postgres:9.3-ram
environment: environment:
POSTGRES_USER: grafanatest POSTGRES_USER: grafanatest
...@@ -58,7 +58,7 @@ jobs: ...@@ -58,7 +58,7 @@ jobs:
cache-server-test: cache-server-test:
docker: docker:
- image: circleci/golang:1.11.5 - image: circleci/golang:1.12.4
- image: circleci/redis:4-alpine - image: circleci/redis:4-alpine
- image: memcached - image: memcached
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
...@@ -88,7 +88,7 @@ jobs: ...@@ -88,7 +88,7 @@ jobs:
backend-lint: backend-lint:
docker: docker:
- image: circleci/golang:1.11.5 - image: circleci/golang:1.12.4
environment: environment:
# we need CGO because of go-sqlite3 # we need CGO because of go-sqlite3
CGO_ENABLED: 1 CGO_ENABLED: 1
...@@ -120,7 +120,7 @@ jobs: ...@@ -120,7 +120,7 @@ jobs:
test-backend: test-backend:
docker: docker:
- image: circleci/golang:1.11.5 - image: circleci/golang:1.12.4
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -130,7 +130,7 @@ jobs: ...@@ -130,7 +130,7 @@ jobs:
build-all: build-all:
docker: docker:
- image: grafana/build-container:1.2.4 - image: grafana/build-container:1.2.6
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -174,7 +174,7 @@ jobs: ...@@ -174,7 +174,7 @@ jobs:
build: build:
docker: docker:
- image: grafana/build-container:1.2.4 - image: grafana/build-container:1.2.6
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -243,7 +243,7 @@ jobs: ...@@ -243,7 +243,7 @@ jobs:
build-enterprise: build-enterprise:
docker: docker:
- image: grafana/build-container:1.2.4 - image: grafana/build-container:1.2.6
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -275,7 +275,7 @@ jobs: ...@@ -275,7 +275,7 @@ jobs:
build-all-enterprise: build-all-enterprise:
docker: docker:
- image: grafana/build-container:1.2.4 - image: grafana/build-container:1.2.6
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
......
Dockerfile
# Golang build container # Golang build container
FROM golang:1.11.5 FROM golang:1.12.4
WORKDIR $GOPATH/src/github.com/grafana/grafana WORKDIR $GOPATH/src/github.com/grafana/grafana
......
pkg/api/dashboard.go
...@@ -407,7 +407,14 @@ func GetDashboardVersion(c *m.ReqContext) Response { ...@@ -407,7 +407,14 @@ func GetDashboardVersion(c *m.ReqContext) Response {
} }
dashVersionMeta := &m.DashboardVersionMeta{ dashVersionMeta := &m.DashboardVersionMeta{
DashboardVersion: *query.Result, Id: query.Result.Id,
DashboardId: query.Result.DashboardId,
Data: query.Result.Data,
ParentVersion: query.Result.ParentVersion,
RestoredFrom: query.Result.RestoredFrom,
Version: query.Result.Version,
Created: query.Result.Created,
Message: query.Result.Message,
CreatedBy: creator, CreatedBy: creator,
} }
......
pkg/models/dashboard_version.go
...@@ -32,7 +32,14 @@ type DashboardVersion struct { ...@@ -32,7 +32,14 @@ type DashboardVersion struct {
// associated with the UserIds, overriding the field with the same name from // associated with the UserIds, overriding the field with the same name from
// the DashboardVersion model. // the DashboardVersion model.
type DashboardVersionMeta struct { type DashboardVersionMeta struct {
DashboardVersion Id int64 `json:"id"`
DashboardId int64 `json:"dashboardId"`
ParentVersion int `json:"parentVersion"`
RestoredFrom int `json:"restoredFrom"`
Version int `json:"version"`
Created time.Time `json:"created"`
Message string `json:"message"`
Data *simplejson.Json `json:"data"`
CreatedBy string `json:"createdBy"` CreatedBy string `json:"createdBy"`
} }
......
scripts/build/ci-build/Dockerfile
...@@ -69,7 +69,7 @@ RUN apt-get update && \ ...@@ -69,7 +69,7 @@ RUN apt-get update && \
# base image to crossbuild grafana # base image to crossbuild grafana
FROM ubuntu:14.04 FROM ubuntu:14.04
ENV GOVERSION=1.11.5 \ ENV GOVERSION=1.12.4 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=10.14.2 NODEVERSION=10.14.2
......
scripts/build/ci-build/build-deploy.sh
#!/bin/bash #!/bin/bash
_version="1.2.4" _version="1.2.6"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
docker build -t $_tag . docker build -t $_tag .
......
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