Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
30dcf0f6
Unverified
Commit
30dcf0f6
authored
Apr 12, 2019
by
Carl Bergquist
Committed by
GitHub
Apr 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Build: Upgrades to go 1.12.3 (#16491)" (#16544)
This reverts commit
44b36502
.
parent
23535c2b
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
33 deletions
+18
-33
.circleci/config.yml
+9
-9
Dockerfile
+1
-1
UPGRADING_DEPENDENCIES.md
+2
-2
pkg/api/dashboard.go
+2
-9
pkg/models/dashboard_version.go
+2
-10
scripts/build/ci-build/Dockerfile
+1
-1
scripts/build/ci-build/build-deploy.sh
+1
-1
No files found.
.circleci/config.yml
View file @
30dcf0f6
...
...
@@ -19,7 +19,7 @@ version: 2
jobs
:
mysql-integration-test
:
docker
:
-
image
:
circleci/golang:1.1
2.3
-
image
:
circleci/golang:1.1
1.5
-
image
:
circleci/mysql:5.6-ram
environment
:
MYSQL_ROOT_PASSWORD
:
rootpass
...
...
@@ -39,7 +39,7 @@ jobs:
postgres-integration-test
:
docker
:
-
image
:
circleci/golang:1.1
2.3
-
image
:
circleci/golang:1.1
1.5
-
image
:
circleci/postgres:9.3-ram
environment
:
POSTGRES_USER
:
grafanatest
...
...
@@ -58,7 +58,7 @@ jobs:
cache-server-test
:
docker
:
-
image
:
circleci/golang:1.1
2.3
-
image
:
circleci/golang:1.1
1.5
-
image
:
circleci/redis:4-alpine
-
image
:
memcached
working_directory
:
/go/src/github.com/grafana/grafana
...
...
@@ -88,7 +88,7 @@ jobs:
backend-lint
:
docker
:
-
image
:
circleci/golang:1.1
2.3
-
image
:
circleci/golang:1.1
1.5
environment
:
# we need CGO because of go-sqlite3
CGO_ENABLED
:
1
...
...
@@ -120,7 +120,7 @@ jobs:
test-backend
:
docker
:
-
image
:
circleci/golang:1.1
2.3
-
image
:
circleci/golang:1.1
1.5
working_directory
:
/go/src/github.com/grafana/grafana
steps
:
-
checkout
...
...
@@ -130,7 +130,7 @@ jobs:
build-all
:
docker
:
-
image
:
grafana/build-container:1.2.
5
-
image
:
grafana/build-container:1.2.
4
working_directory
:
/go/src/github.com/grafana/grafana
steps
:
-
checkout
...
...
@@ -174,7 +174,7 @@ jobs:
build
:
docker
:
-
image
:
grafana/build-container:1.2.
5
-
image
:
grafana/build-container:1.2.
4
working_directory
:
/go/src/github.com/grafana/grafana
steps
:
-
checkout
...
...
@@ -243,7 +243,7 @@ jobs:
build-enterprise
:
docker
:
-
image
:
grafana/build-container:1.2.
5
-
image
:
grafana/build-container:1.2.
4
working_directory
:
/go/src/github.com/grafana/grafana
steps
:
-
checkout
...
...
@@ -275,7 +275,7 @@ jobs:
build-all-enterprise
:
docker
:
-
image
:
grafana/build-container:1.2.
5
-
image
:
grafana/build-container:1.2.
4
working_directory
:
/go/src/github.com/grafana/grafana
steps
:
-
checkout
...
...
Dockerfile
View file @
30dcf0f6
# Golang build container
FROM
golang:1.1
2.3
FROM
golang:1.1
1.5
WORKDIR
$GOPATH/src/github.com/grafana/grafana
...
...
UPGRADING_DEPENDENCIES.md
View file @
30dcf0f6
...
...
@@ -5,14 +5,14 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
## Go
-
CircleCi
-
`
/scripts/build/ci-build/Dockerfile
`
-
`
grafana/build-container
`
-
Appveyor
-
Dockerfile
## Node.js
-
CircleCI
-
`
scripts/build/ci-build/Dockerfile
`
-
`
grafana/build-container
`
-
Appveyor
-
Dockerfile
...
...
pkg/api/dashboard.go
View file @
30dcf0f6
...
...
@@ -407,15 +407,8 @@ func GetDashboardVersion(c *m.ReqContext) Response {
}
dashVersionMeta
:=
&
m
.
DashboardVersionMeta
{
Id
:
query
.
Result
.
Id
,
DashboardId
:
query
.
Result
.
DashboardId
,
ParentVersion
:
query
.
Result
.
ParentVersion
,
RestoredFrom
:
query
.
Result
.
RestoredFrom
,
Version
:
query
.
Result
.
Version
,
Created
:
query
.
Result
.
Created
,
Message
:
query
.
Result
.
Message
,
Data
:
query
.
Result
.
Data
,
CreatedBy
:
creator
,
DashboardVersion
:
*
query
.
Result
,
CreatedBy
:
creator
,
}
return
JSON
(
200
,
dashVersionMeta
)
...
...
pkg/models/dashboard_version.go
View file @
30dcf0f6
...
...
@@ -32,16 +32,8 @@ type DashboardVersion struct {
// associated with the UserIds, overriding the field with the same name from
// the DashboardVersion model.
type
DashboardVersionMeta
struct
{
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"`
DashboardVersion
CreatedBy
string
`json:"createdBy"`
}
// DashboardVersionDTO represents a dashboard version, without the dashboard
...
...
scripts/build/ci-build/Dockerfile
View file @
30dcf0f6
...
...
@@ -69,7 +69,7 @@ RUN apt-get update && \
# base image to crossbuild grafana
FROM
ubuntu:14.04
ENV
GOVERSION=1.1
2.3
\
ENV
GOVERSION=1.1
1.5
\
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=10.14.2
...
...
scripts/build/ci-build/build-deploy.sh
View file @
30dcf0f6
#!/bin/bash
_version
=
"1.2.
5
"
_version
=
"1.2.
4
"
_tag
=
"grafana/build-container:
${
_version
}
"
docker build
-t
$_tag
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment