فهرست منبع

fix(build): minor fix for build script to make latest copy for rpm when version is pre release version

Torkel Ödegaard 10 سال پیش
والد
کامیت
b70b730cb9
1فایلهای تغییر یافته به همراه7 افزوده شده و 2 حذف شده
  1. 7 2
      build.go

+ 7 - 2
build.go

@@ -73,7 +73,7 @@ func main() {
 
 		case "package":
 			//verifyGitRepoIsClean()
-			grunt("release")
+			// grunt("release")
 			createLinuxPackages()
 
 		case "latest":
@@ -89,8 +89,13 @@ func main() {
 }
 
 func makeLatestDistCopies() {
+	rpmIteration := "-1"
+	if linuxPackageIteration != "" {
+		rpmIteration = "-" + linuxPackageIteration
+	}
+
 	runError("cp", "dist/grafana_"+version+"_amd64.deb", "dist/grafana_latest_amd64.deb")
-	runError("cp", "dist/grafana-"+strings.Replace(version, "-", "_", 5)+"-1.x86_64.rpm", "dist/grafana-latest-1.x86_64.rpm")
+	runError("cp", "dist/grafana-"+linuxPackageVersion+rpmIteration+".x86_64.rpm", "dist/grafana-latest-1.x86_64.rpm")
 	runError("cp", "dist/grafana-"+version+".linux-x64.tar.gz", "dist/grafana-latest.linux-x64.tar.gz")
 }