Explorar o código

build(): build fix

Torkel Ödegaard %!s(int64=9) %!d(string=hai) anos
pai
achega
953f9da3b5
Modificáronse 2 ficheiros con 6 adicións e 6 borrados
  1. 1 0
      Gruntfile.js
  2. 5 6
      build.go

+ 1 - 0
Gruntfile.js

@@ -18,6 +18,7 @@ module.exports = function (grunt) {
   }
   }
 
 
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
+  console.log('Version', config.pkg.version);
 
 
   // load plugins
   // load plugins
   require('load-grunt-tasks')(grunt);
   require('load-grunt-tasks')(grunt);

+ 5 - 6
build.go

@@ -73,8 +73,7 @@ func main() {
 			grunt("test")
 			grunt("test")
 
 
 		case "package":
 		case "package":
-			//verifyGitRepoIsClean()
-			grunt("release")
+			grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
 			createLinuxPackages()
 			createLinuxPackages()
 
 
 		case "pkg-rpm":
 		case "pkg-rpm":
@@ -100,12 +99,12 @@ func main() {
 func makeLatestDistCopies() {
 func makeLatestDistCopies() {
 	rpmIteration := "-1"
 	rpmIteration := "-1"
 	if linuxPackageIteration != "" {
 	if linuxPackageIteration != "" {
-		rpmIteration = "-" + linuxPackageIteration
+		rpmIteration = linuxPackageIteration
 	}
 	}
 
 
-	runError("cp", "dist/grafana_"+linuxPackageVersion+linuxPackageIteration+"_amd64.deb", "dist/grafana_latest_amd64.deb")
-	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")
+	runError("cp", fmt.Sprintf("dist/grafana_%v-%v_amd64.deb", linuxPackageVersion, linuxPackageIteration), "dist/grafana_latest_amd64.deb")
+	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.x86_64.rpm", linuxPackageVersion, rpmIteration), "dist/grafana-latest-1.x86_64.rpm")
+	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.linux-x64.tar.gz", linuxPackageVersion, linuxPackageIteration), "dist/grafana-latest.linux-x64.tar.gz")
 }
 }
 
 
 func readVersionFromPackageJson() {
 func readVersionFromPackageJson() {