build(): build fix

This commit is contained in:
Torkel Ödegaard
2016-03-30 12:02:44 -07:00
parent 97b304abc9
commit 953f9da3b5
2 changed files with 6 additions and 6 deletions
+1
View File
@@ -18,6 +18,7 @@ module.exports = function (grunt) {
}
config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
console.log('Version', config.pkg.version);
// load plugins
require('load-grunt-tasks')(grunt);
+5 -6
View File
@@ -73,8 +73,7 @@ func main() {
grunt("test")
case "package":
//verifyGitRepoIsClean()
grunt("release")
grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
createLinuxPackages()
case "pkg-rpm":
@@ -100,12 +99,12 @@ func main() {
func makeLatestDistCopies() {
rpmIteration := "-1"
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() {