fix(build): always use git tag for version number
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Resolves ble-not-possible-version-number-does-not-start-with-digit/3371
This commit is contained in:
parent
1f0f698cab
commit
8d9cf02d3e
33
magefile.go
33
magefile.go
@ -93,6 +93,23 @@ func runCmdWithOutput(name string, arg ...string) (output []byte, err error) {
|
||||
}
|
||||
|
||||
func getRawVersionString() (version string, err error) {
|
||||
version, err = getRawVersionNumber()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if version == "main" {
|
||||
version = "unstable"
|
||||
}
|
||||
|
||||
if version != "" && version != "unstable" {
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func getRawVersionNumber() (version string, err error) {
|
||||
versionEnv := os.Getenv("RELEASE_VERSION")
|
||||
if versionEnv != "" {
|
||||
return versionEnv, nil
|
||||
@ -103,15 +120,7 @@ func getRawVersionString() (version string, err error) {
|
||||
}
|
||||
|
||||
if os.Getenv("DRONE_BRANCH") != "" {
|
||||
version = strings.Replace(os.Getenv("DRONE_BRANCH"), "release/v", "", 1)
|
||||
}
|
||||
|
||||
if version == "main" {
|
||||
version = "unstable"
|
||||
}
|
||||
|
||||
if version != "" {
|
||||
return
|
||||
return strings.Replace(os.Getenv("DRONE_BRANCH"), "release/v", "", 1), nil
|
||||
}
|
||||
|
||||
versionBytes, err := runCmdWithOutput("git", "describe", "--tags", "--always", "--abbrev=10")
|
||||
@ -119,13 +128,15 @@ func getRawVersionString() (version string, err error) {
|
||||
}
|
||||
|
||||
func setVersion() {
|
||||
versionNumber, err := getRawVersionNumber()
|
||||
VersionNumber = strings.Trim(versionNumber, "\n")
|
||||
VersionNumber = strings.Replace(VersionNumber, "-g", "-", 1)
|
||||
|
||||
version, err := getRawVersionString()
|
||||
if err != nil {
|
||||
fmt.Printf("Error getting version: %s\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
VersionNumber = strings.Trim(version, "\n")
|
||||
VersionNumber = strings.Replace(VersionNumber, "-g", "-", 1)
|
||||
Version = version
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user