Skip to content

Commit 6447459

Browse files
committed
Provide default version based on latest tag in branch
Signed-off-by: João Pereira <[email protected]>
1 parent d724fb7 commit 6447459

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ FLAKE_ATTEMPTS ?=5
44
PACKAGES ?= api actor command types util version integration/helpers
55
LC_ALL = "en_US.UTF-8"
66

7+
CF_BUILD_VERSION ?= $$(git describe --tags --abbrev=0)
78
CF_BUILD_SHA ?= $$(git rev-parse --short HEAD)
89
CF_BUILD_DATE ?= $$(date -u +"%Y-%m-%d")
910
LD_FLAGS_COMMON=-w -s \

version/version.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package version
22

3-
import "github.com/blang/semver/v4"
3+
import (
4+
"fmt"
5+
"strings"
6+
7+
"github.com/blang/semver/v4"
8+
)
49

510
const DefaultVersion = "0.0.0-unknown-version"
611

@@ -11,8 +16,11 @@ var (
1116
)
1217

1318
func VersionString() string {
19+
// Remove the "v" prefix from the binary in case it is present
20+
binaryVersion = strings.TrimPrefix(binaryVersion, "v")
1421
versionString, err := semver.Make(binaryVersion)
1522
if err != nil {
23+
fmt.Printf("%s - error: %s\n", binaryVersion, err)
1624
versionString = semver.MustParse(DefaultVersion)
1725
}
1826

0 commit comments

Comments
 (0)