Skip to content

Commit 3182a76

Browse files
authored
Merge pull request #6450 from oasisprotocol/peternose/trivial/trim-distribution
go/common/version: Trim distribution suffixes
2 parents 1d84224 + 334c7e1 commit 3182a76

3 files changed

Lines changed: 3 additions & 0 deletions

File tree

.changelog/6450.trivial.md

Whitespace-only changes.

go/common/version/version.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ func (v Version) String() string {
7979
// major.minor.patch components are considered where major is mandatory.
8080
// Any component following patch is ignored.
8181
func FromString(s string) (Version, error) {
82+
// Trim everything after the first space.
83+
s = strings.Split(s, " ")[0]
8284
// Trim potential pre-release suffix.
8385
s = strings.Split(s, "-")[0]
8486
// Trim potential git commit.

go/common/version/version_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ func TestFromString(t *testing.T) {
8686
{"1.26-rc3", Version{1, 26, 0}},
8787
{"1.26beta3", Version{1, 26, 0}},
8888
{"1.26-beta3", Version{1, 26, 0}},
89+
{"1.25.5 (Red Hat 1.25.5-1.el10_1.alma.1)", Version{1, 25, 5}},
8990
} {
9091
version, err := FromString(v.semver)
9192
require.NoError(err)

0 commit comments

Comments
 (0)