Skip to content

Commit 81297aa

Browse files
committed
Go: Use standard semver format in outputEnvironmentJson
1 parent fabd7a9 commit 81297aa

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

go/extractor/autobuilder/build-environment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func outputEnvironmentJson(version util.SemVer) {
252252
if version == nil {
253253
content = `{ "go": {} }`
254254
} else {
255-
content = `{ "go": { "version": "` + version.String() + `" } }`
255+
content = `{ "go": { "version": "` + version.StandardSemVer() + `" } }`
256256
}
257257
_, err := fmt.Fprint(os.Stdout, content)
258258

go/extractor/util/semver.go

+6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ type SemVer interface {
2828
IsAtMost(other SemVer) bool
2929
// Returns the `major.minor` version prefix of the semantic version. For example, "v1.2.3" becomes "v1.2".
3030
MajorMinor() SemVer
31+
// Renders the semantic version as a standard version string, i.e. without a leading "v".
32+
StandardSemVer() string
3133
}
3234

3335
// The internal representation used for values known to be valid semantic versions.
@@ -122,3 +124,7 @@ func (ver semVer) IsAtMost(other SemVer) bool {
122124
func (ver semVer) MajorMinor() SemVer {
123125
return semVer(semver.MajorMinor(string(ver)))
124126
}
127+
128+
func (ver semVer) StandardSemVer() string {
129+
return string(ver)[1:]
130+
}

go/extractor/util/semver_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ func TestNewSemVer(t *testing.T) {
5252
result,
5353
)
5454
}
55+
if result.StandardSemVer() != expected[1:] {
56+
t.Errorf(
57+
"Expected NewSemVer(\"%s\").StandardSemVer() to return \"%s\", but got \"%s\".",
58+
input,
59+
expected[1:],
60+
result.StandardSemVer(),
61+
)
62+
}
5563
}
5664
}
5765
}

0 commit comments

Comments
 (0)