Correction of version number detection over 2 digits

Songmu · Sep 29, 2022 · 4f2f3c0 · 4f2f3c0
1 parent 0484a15
commit 4f2f3c0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/testdata/vfile3 b/testdata/vfile3
@@ -0,0 +1 @@
+version: 12.3.4
diff --git a/versionfile.go b/versionfile.go
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	versionRegBase = `(?i)((?:^|[^-_0-9a-zA-Z])version[^-_0-9a-zA-Z].{0,50})`
+	versionRegBase = `(?i)((?:^|[^-_0-9a-zA-Z])version[^-_0-9a-zA-Z].{0,50}?)`
 	semverRegBase  = `([0-9]+\.[0-9]+\.[0-9]+)`
 )
 

diff --git a/versionfile_test.go b/versionfile_test.go
@@ -36,15 +36,20 @@ func TestRetrieveVersionFile(t *testing.T) {
 		t.Errorf("detected: %s, expected: %s", ver.Naked(), version)
 	}
 
-	ver, err = retrieveVersionFromFile("testdata/vfile1", true)
+	ver, _ = retrieveVersionFromFile("testdata/vfile1", true)
 	if e, g := "v1.2.3", ver.Tag(); e != g {
 		t.Errorf("got: %s, expected: %s", g, e)
 	}
 
-	ver, err = retrieveVersionFromFile("testdata/vfile2", false)
+	ver, _ = retrieveVersionFromFile("testdata/vfile2", false)
 	if e, g := "1.3.5", ver.Tag(); e != g {
 		t.Errorf("got: %s, expected: %s", g, e)
 	}
+
+	ver, _ = retrieveVersionFromFile("testdata/vfile3", false)
+	if e, g := "12.3.4", ver.Tag(); e != g {
+		t.Errorf("got: %s, expected: %s", g, e)
+	}
 }
 
 func TestDetectVersionFile(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     )
     const (
-    	versionRegBase = `(?i)((?:^|[^-_0-9a-zA-Z])version[^-_0-9a-zA-Z].{0,50})`
+    	versionRegBase = `(?i)((?:^|[^-_0-9a-zA-Z])version[^-_0-9a-zA-Z].{0,50}?)`
     	semverRegBase  = `([0-9]+\.[0-9]+\.[0-9]+)`
     )
@@ Expand Down @@