mirror of
https://github.com/zyedidia/micro
synced 2024-11-05 17:41:24 +00:00
Set version as release when there are no commits ahead (#3515)
Print release version tag in tools/build-version.go even if the commit being checked has a tag that is not a version number if there are no commits ahead.
This commit is contained in:
parent
3cb8069e4a
commit
2c6dc32f5d
1 changed files with 6 additions and 7 deletions
|
@ -47,15 +47,16 @@ func main() {
|
|||
fmt.Println("0.0.0-unknown")
|
||||
return
|
||||
}
|
||||
// Get the tag of the current revision.
|
||||
tag, _ := getTag("--exact-match")
|
||||
if tag == versionStr {
|
||||
if ahead == nil {
|
||||
// Seems that we are going to build a release.
|
||||
// So the version number should already be correct.
|
||||
fmt.Println(version.String())
|
||||
return
|
||||
}
|
||||
|
||||
// Get the tag of the current revision.
|
||||
tag, _ := getTag("--exact-match")
|
||||
|
||||
// If we don't have any tag assume "dev"
|
||||
if tag == "" || strings.HasPrefix(tag, "nightly") {
|
||||
tag = "dev"
|
||||
|
@ -72,10 +73,8 @@ func main() {
|
|||
log.Printf("semver.NewPRVersion(%s): %v", tag, err)
|
||||
}
|
||||
|
||||
if ahead != nil {
|
||||
// if we know how many commits we are ahead of the last release, append that too.
|
||||
version.Pre = append(version.Pre, *ahead)
|
||||
}
|
||||
// append how many commits we are ahead of the last release
|
||||
version.Pre = append(version.Pre, *ahead)
|
||||
|
||||
fmt.Println(version.String())
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue