IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: fixes broken path for bra run

Browse Source 
removes os and arch from binary path
when building in dev mode
This commit is contained in:
bergquist
2018-05-28 10:39:42 +02:00
parent 6c259eb04d
commit a2ed0b15da
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.go
+8 -2
View File
@@ -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) {
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"