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
a2ed0b15
Commit
a2ed0b15
authored
May 28, 2018
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fixes broken path for bra run
removes os and arch from binary path when building in dev mode
parent
6c259eb0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
build.go
+11
-5
No files found.
build.go
View file @
a2ed0b15
...
@@ -156,8 +156,8 @@ func makeLatestDistCopies() {
...
@@ -156,8 +156,8 @@ func makeLatestDistCopies() {
}
}
latestMapping
:=
map
[
string
]
string
{
latestMapping
:=
map
[
string
]
string
{
"_amd64.deb"
:
"dist/grafana_latest_amd64.deb"
,
"_amd64.deb"
:
"dist/grafana_latest_amd64.deb"
,
".x86_64.rpm"
:
"dist/grafana-latest-1.x86_64.rpm"
,
".x86_64.rpm"
:
"dist/grafana-latest-1.x86_64.rpm"
,
".linux-amd64.tar.gz"
:
"dist/grafana-latest.linux-x64.tar.gz"
,
".linux-amd64.tar.gz"
:
"dist/grafana-latest.linux-x64.tar.gz"
,
}
}
...
@@ -232,7 +232,7 @@ func createDebPackages() {
...
@@ -232,7 +232,7 @@ func createDebPackages() {
previousPkgArch
:=
pkgArch
previousPkgArch
:=
pkgArch
if
pkgArch
==
"armv7"
{
if
pkgArch
==
"armv7"
{
pkgArch
=
"armhf"
pkgArch
=
"armhf"
}
}
createPackage
(
linuxPackageOptions
{
createPackage
(
linuxPackageOptions
{
packageType
:
"deb"
,
packageType
:
"deb"
,
homeDir
:
"/usr/share/grafana"
,
homeDir
:
"/usr/share/grafana"
,
...
@@ -256,8 +256,10 @@ func createDebPackages() {
...
@@ -256,8 +256,10 @@ func createDebPackages() {
func
createRpmPackages
()
{
func
createRpmPackages
()
{
previousPkgArch
:=
pkgArch
previousPkgArch
:=
pkgArch
switch
{
switch
{
case
pkgArch
==
"armv7"
:
pkgArch
=
"armhfp"
case
pkgArch
==
"armv7"
:
case
pkgArch
==
"arm64"
:
pkgArch
=
"aarch64"
pkgArch
=
"armhfp"
case
pkgArch
==
"arm64"
:
pkgArch
=
"aarch64"
}
}
createPackage
(
linuxPackageOptions
{
createPackage
(
linuxPackageOptions
{
packageType
:
"rpm"
,
packageType
:
"rpm"
,
...
@@ -416,6 +418,10 @@ func test(pkg string) {
...
@@ -416,6 +418,10 @@ func test(pkg string) {
func
build
(
binaryName
,
pkg
string
,
tags
[]
string
)
{
func
build
(
binaryName
,
pkg
string
,
tags
[]
string
)
{
binary
:=
fmt
.
Sprintf
(
"./bin/%s-%s/%s"
,
goos
,
goarch
,
binaryName
)
binary
:=
fmt
.
Sprintf
(
"./bin/%s-%s/%s"
,
goos
,
goarch
,
binaryName
)
if
isDev
{
//dont include os and arch in output path in dev environment
binary
=
fmt
.
Sprintf
(
"./bin/%s"
,
binaryName
)
}
if
goos
==
"windows"
{
if
goos
==
"windows"
{
binary
+=
".exe"
binary
+=
".exe"
...
...
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