Skip to content

Commit 4f2f3c0

Browse files
committed
Correction of version number detection over 2 digits
1 parent 0484a15 commit 4f2f3c0

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

testdata/vfile3

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version: 12.3.4

versionfile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
const (
18-
versionRegBase = `(?i)((?:^|[^-_0-9a-zA-Z])version[^-_0-9a-zA-Z].{0,50})`
18+
versionRegBase = `(?i)((?:^|[^-_0-9a-zA-Z])version[^-_0-9a-zA-Z].{0,50}?)`
1919
semverRegBase = `([0-9]+\.[0-9]+\.[0-9]+)`
2020
)
2121

versionfile_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,20 @@ func TestRetrieveVersionFile(t *testing.T) {
3636
t.Errorf("detected: %s, expected: %s", ver.Naked(), version)
3737
}
3838

39-
ver, err = retrieveVersionFromFile("testdata/vfile1", true)
39+
ver, _ = retrieveVersionFromFile("testdata/vfile1", true)
4040
if e, g := "v1.2.3", ver.Tag(); e != g {
4141
t.Errorf("got: %s, expected: %s", g, e)
4242
}
4343

44-
ver, err = retrieveVersionFromFile("testdata/vfile2", false)
44+
ver, _ = retrieveVersionFromFile("testdata/vfile2", false)
4545
if e, g := "1.3.5", ver.Tag(); e != g {
4646
t.Errorf("got: %s, expected: %s", g, e)
4747
}
48+
49+
ver, _ = retrieveVersionFromFile("testdata/vfile3", false)
50+
if e, g := "12.3.4", ver.Tag(); e != g {
51+
t.Errorf("got: %s, expected: %s", g, e)
52+
}
4853
}
4954

5055
func TestDetectVersionFile(t *testing.T) {

0 commit comments

Comments
 (0)