mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
build: use correct version for tar.gz files
This commit is contained in:
parent
7d897c0980
commit
3ef077c180
27
build.go
27
build.go
@ -20,6 +20,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
"path"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -120,14 +121,24 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func makeLatestDistCopies() {
|
func makeLatestDistCopies() {
|
||||||
rpmIteration := "-1"
|
files, err := ioutil.ReadDir("dist")
|
||||||
if linuxPackageIteration != "" {
|
if err != nil {
|
||||||
rpmIteration = linuxPackageIteration
|
log.Fatalf("failed to create latest copies. Cannot read from /dist")
|
||||||
}
|
}
|
||||||
|
|
||||||
runError("cp", fmt.Sprintf("dist/grafana_%v-%v_amd64.deb", linuxPackageVersion, linuxPackageIteration), "dist/grafana_latest_amd64.deb")
|
latestMapping := map[string]string {
|
||||||
runError("cp", fmt.Sprintf("dist/grafana-%v-%v.x86_64.rpm", linuxPackageVersion, rpmIteration), "dist/grafana-latest-1.x86_64.rpm")
|
".deb": "dist/grafana_latest_amd64.deb",
|
||||||
runError("cp", fmt.Sprintf("dist/grafana-%v-%v.linux-x64.tar.gz", linuxPackageVersion, linuxPackageIteration), "dist/grafana-latest.linux-x64.tar.gz")
|
".rpm": "dist/grafana-latest-1.x86_64.rpm",
|
||||||
|
".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range files {
|
||||||
|
for extension, fullName := range latestMapping {
|
||||||
|
if strings.HasSuffix(file.Name(), extension) {
|
||||||
|
runError("cp", path.Join("dist", file.Name()), fullName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func readVersionFromPackageJson() {
|
func readVersionFromPackageJson() {
|
||||||
@ -332,9 +343,9 @@ func grunt(params ...string) {
|
|||||||
func gruntBuildArg(task string) []string {
|
func gruntBuildArg(task string) []string {
|
||||||
args := []string{task}
|
args := []string{task}
|
||||||
if includeBuildNumber {
|
if includeBuildNumber {
|
||||||
args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
|
args = append(args, fmt.Sprintf("--pkgVer=%v-%v", version, linuxPackageIteration))
|
||||||
} else {
|
} else {
|
||||||
args = append(args, fmt.Sprintf("--pkgVer=%v", linuxPackageVersion))
|
args = append(args, fmt.Sprintf("--pkgVer=%v", version))
|
||||||
}
|
}
|
||||||
if pkgArch != "" {
|
if pkgArch != "" {
|
||||||
args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
|
args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
|
||||||
|
Loading…
Reference in New Issue
Block a user