hack: fix v-prefixing in pseudo-version tool

pre-release versions and release versions behaved differently.
This lead to a duplicate v prefix in the cli's version.
This commit is contained in:
Otto Bittner 2023-04-27 18:35:29 +02:00
parent e72fb954f1
commit caa0732955
5 changed files with 12 additions and 6 deletions

View File

@ -95,9 +95,15 @@ func main() {
default:
if !strings.Contains(*base, "pre") {
// "v2.7.0" inside the version.txt will lead to "v2.7.0" as version
fmt.Println(*base)
// "2.7.0" inside the version.txt will lead to "2.7.0" as version
if *skipV {
fmt.Println(strings.TrimPrefix(*base, "v"))
} else {
fmt.Println(*base)
}
} else {
// "2.7.0-pre" inside the version.txt will lead to "v2.7.0-pre.0.20230313121936-bab76e8a9acf" as version
// "v2.7.0-pre" inside the version.txt will lead to "v2.7.0-pre.0.20230313121936-bab76e8a9acf" as version
// "2.7.0-pre" inside the version.txt will lead to "v0.0.0-20230313121936-bab76e8a9acf" as version
fmt.Println(version)
}
}

View File

@ -1 +1 @@
cdcd25c6948d848c4e40874c372cbe724c4ea7dd81c782570a16bf88b968de43
a92a401f547d51d201af74af204ad20485e3e507c20232378c2d5943e9f316aa

View File

@ -1 +1 @@
6954452bf363ca9caa76d3d0f67fa1385bbe6a537e5763132c310bf3c147f2d8
f8a46ce6af4945170ec1fe2220441a8b87a660ec9c3e20db7e307ddf434a64e0

View File

@ -1 +1 @@
09b18e2a52eb161c07937402e4aa8200068386b0c0b643260ce4b3aab5b46452
388e68aa5998086a96bd8165d1ff469c54a2a9a718d93e2a70e7a2742494781f

View File

@ -1 +1 @@
eb388c2135e5fe3a61e0babbf17a762ed63203ecc32741902c88ce8e1e3fdcf7
127df272217881aed6759bd4cd9e8432411150f33b4eebe53b30514f06b0cd2d