IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 08:56:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated build.go to get better version/build names

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-04 14:48:21 +01:00
parent de1e762528
commit 6bf4edade1
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.go
View File

@ -5,7 +5,6 @@ package main
import (
"bytes"
"crypto/md5"
"encoding/json"
"flag"
"fmt"
"io"
@ -70,6 +69,7 @@ func main() {
case "test":
test("./pkg/...")
grunt("test")
case "latest":
version += "-" + getGitSha()
@ -89,21 +89,27 @@ func main() {
}
func readVersionFromPackageJson() {
reader, err := os.Open("package.json")
v, err := runError("git", "describe", "--tags", "--dirty")
if err != nil {
log.Fatal("Failed to open package.json")
return
return "unknown-ver"
}
defer reader.Close()
version = v
jsonObj := map[string]interface{}{}
jsonParser := json.NewDecoder(reader)
if err := jsonParser.Decode(&jsonObj); err != nil {
log.Fatal("Failed to decode package.json")
}
version = jsonObj["version"].(string)
// reader, err := os.Open("package.json")
// if err != nil {
// log.Fatal("Failed to open package.json")
// return
// }
// defer reader.Close()
//
// jsonObj := map[string]interface{}{}
// jsonParser := json.NewDecoder(reader)
//
// if err := jsonParser.Decode(&jsonObj); err != nil {
// log.Fatal("Failed to decode package.json")
// }
//
// version = jsonObj["version"].(string)
}
func createRpmAndDeb() {