tools/build-version.go: Improve error verbosity

This commit is contained in:
Jöran Karl 2024-06-17 10:34:31 +02:00
parent ced6d9487a
commit f5a9744bde

View File

@ -4,6 +4,7 @@ package main
import ( import (
"fmt" "fmt"
"log"
"os/exec" "os/exec"
"strings" "strings"
@ -19,13 +20,17 @@ func getTag(match ...string) (string, *semver.PRVersion) {
} else { } else {
tagParts := strings.Split(string(tag), "-") tagParts := strings.Split(string(tag), "-")
if len(tagParts) == 3 { if len(tagParts) == 3 {
if ahead, err := semver.NewPRVersion(tagParts[1]); err == nil { ahead, err := semver.NewPRVersion(tagParts[1])
if err == nil {
return tagParts[0], &ahead return tagParts[0], &ahead
} }
log.Printf("semver.NewPRVersion(%s): %v", tagParts[1], err)
} else if len(tagParts) == 4 { } else if len(tagParts) == 4 {
if ahead, err := semver.NewPRVersion(tagParts[2]); err == nil { ahead, err := semver.NewPRVersion(tagParts[2])
if err == nil {
return tagParts[0] + "-" + tagParts[1], &ahead return tagParts[0] + "-" + tagParts[1], &ahead
} }
log.Printf("semver.NewPRVersion(%s): %v", tagParts[2], err)
} }
return string(tag), nil return string(tag), nil
@ -33,15 +38,30 @@ func getTag(match ...string) (string, *semver.PRVersion) {
} }
func main() { func main() {
if tags, err := exec.Command("git", "tag").Output(); err != nil || len(tags) == 0 { tags, err := exec.Command("git", "tag").Output()
// no tags found -- fetch them if err != nil {
exec.Command("git", "fetch", "--tags").Run() log.Println("git tag:", err)
if e, ok := err.(*exec.ExitError); ok {
log.Print(string(e.Stderr))
}
} }
if len(tags) == 0 {
// no tags found -- fetch them
err = exec.Command("git", "fetch", "--tags").Run()
if err != nil {
log.Println("git fetch --tags:", err)
if e, ok := err.(*exec.ExitError); ok {
log.Print(string(e.Stderr))
}
}
}
// Find the last vX.X.X Tag and get how many builds we are ahead of it. // Find the last vX.X.X Tag and get how many builds we are ahead of it.
versionStr, ahead := getTag("--match", "v*") versionStr, ahead := getTag("--match", "v*")
version, err := semver.ParseTolerant(versionStr) version, err := semver.ParseTolerant(versionStr)
if err != nil { if err != nil {
// no version tag found so just return what ever we can find. // no version tag found so just return what ever we can find.
log.Printf("semver.ParseTolerant(%s): %v", versionStr, err)
fmt.Println("0.0.0-unknown") fmt.Println("0.0.0-unknown")
return return
} }
@ -66,6 +86,8 @@ func main() {
if pr, err := semver.NewPRVersion(tag); err == nil { if pr, err := semver.NewPRVersion(tag); err == nil {
// append the tag as pre-release name // append the tag as pre-release name
version.Pre = append(version.Pre, pr) version.Pre = append(version.Pre, pr)
} else {
log.Printf("semver.NewPRVersion(%s): %v", tag, err)
} }
if ahead != nil { if ahead != nil {