Skip to content

Commit 6596ab0

Browse files
committed
core/version: skip module if versioned as 'devel'
1 parent 42d8fdf commit 6596ab0

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

intra/core/version.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"fmt"
1212
"runtime"
1313
"runtime/debug"
14+
"strings"
1415
)
1516

1617
var buildinfo, _ = debug.ReadBuildInfo()
@@ -27,11 +28,15 @@ func Version() string {
2728
}
2829

2930
func stamp() string {
30-
if buildinfo != nil {
31-
// github.com/golang/go/issues/50603
32-
return buildinfo.Main.Path + "@v" + buildinfo.Main.Version
31+
path := ""
32+
v := "v" + Date + "-" + Commit
33+
if buildinfo != nil { // github.com/golang/go/issues/50603
34+
path = buildinfo.Main.Path + "@"
35+
if len(buildinfo.Main.Version) > 0 && !strings.Contains(buildinfo.Main.Version, "devel") {
36+
v = "v" + buildinfo.Main.Version
37+
}
3338
}
34-
return "v" + Date + "-" + Commit
39+
return path + v
3540
}
3641

3742
func BuildInfo() string {

0 commit comments

Comments
 (0)