Skip to content

Commit f5a9744

Browse files
committed
tools/build-version.go: Improve error verbosity
1 parent ced6d94 commit f5a9744

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

tools/build-version.go

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package main
44

55
import (
66
"fmt"
7+
"log"
78
"os/exec"
89
"strings"
910

@@ -19,29 +20,48 @@ func getTag(match ...string) (string, *semver.PRVersion) {
1920
} else {
2021
tagParts := strings.Split(string(tag), "-")
2122
if len(tagParts) == 3 {
22-
if ahead, err := semver.NewPRVersion(tagParts[1]); err == nil {
23+
ahead, err := semver.NewPRVersion(tagParts[1])
24+
if err == nil {
2325
return tagParts[0], &ahead
2426
}
27+
log.Printf("semver.NewPRVersion(%s): %v", tagParts[1], err)
2528
} else if len(tagParts) == 4 {
26-
if ahead, err := semver.NewPRVersion(tagParts[2]); err == nil {
29+
ahead, err := semver.NewPRVersion(tagParts[2])
30+
if err == nil {
2731
return tagParts[0] + "-" + tagParts[1], &ahead
2832
}
33+
log.Printf("semver.NewPRVersion(%s): %v", tagParts[2], err)
2934
}
3035

3136
return string(tag), nil
3237
}
3338
}
3439

3540
func main() {
36-
if tags, err := exec.Command("git", "tag").Output(); err != nil || len(tags) == 0 {
41+
tags, err := exec.Command("git", "tag").Output()
42+
if err != nil {
43+
log.Println("git tag:", err)
44+
if e, ok := err.(*exec.ExitError); ok {
45+
log.Print(string(e.Stderr))
46+
}
47+
}
48+
if len(tags) == 0 {
3749
// no tags found -- fetch them
38-
exec.Command("git", "fetch", "--tags").Run()
50+
err = exec.Command("git", "fetch", "--tags").Run()
51+
if err != nil {
52+
log.Println("git fetch --tags:", err)
53+
if e, ok := err.(*exec.ExitError); ok {
54+
log.Print(string(e.Stderr))
55+
}
56+
}
3957
}
58+
4059
// Find the last vX.X.X Tag and get how many builds we are ahead of it.
4160
versionStr, ahead := getTag("--match", "v*")
4261
version, err := semver.ParseTolerant(versionStr)
4362
if err != nil {
4463
// no version tag found so just return what ever we can find.
64+
log.Printf("semver.ParseTolerant(%s): %v", versionStr, err)
4565
fmt.Println("0.0.0-unknown")
4666
return
4767
}
@@ -66,6 +86,8 @@ func main() {
6686
if pr, err := semver.NewPRVersion(tag); err == nil {
6787
// append the tag as pre-release name
6888
version.Pre = append(version.Pre, pr)
89+
} else {
90+
log.Printf("semver.NewPRVersion(%s): %v", tag, err)
6991
}
7092

7193
if ahead != nil {

0 commit comments

Comments
 (0)