|
|
@ -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() { |
|
|
|
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() { |
|
|
|
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" |
|
|
|