Fix "full tag" match pattern

PaulHatch · Feb 25, 2021 · ed818a7 · ed818a7
1 parent d061f3f
commit ed818a7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1139,7 +1139,7 @@ async function run() {
       branch = (await cmd('git', 'rev-parse', 'HEAD')).trim();
     }
 
-    const versionPattern = shortTags ? '*[0-9.]' : '[0-9]+\\.[0-9]+\\.[0-9]+'
+    const versionPattern = shortTags ? '*[0-9.]' : '*[0-9].*[0-9].*[0-9]'
     const releasePattern = namespace === '' ? `${tagPrefix}${versionPattern}` : `${tagPrefix}${versionPattern}-${namespace}`;
     let major = 0, minor = 0, patch = 0, increment = 0;
     let changed = true;

diff --git a/index.js b/index.js
@@ -118,7 +118,7 @@ async function run() {
       branch = (await cmd('git', 'rev-parse', 'HEAD')).trim();
     }
 
-    const versionPattern = shortTags ? '*[0-9.]' : '[0-9]+\\.[0-9]+\\.[0-9]+'
+    const versionPattern = shortTags ? '*[0-9.]' : '*[0-9].*[0-9].*[0-9]'
     const releasePattern = namespace === '' ? `${tagPrefix}${versionPattern}` : `${tagPrefix}${versionPattern}-${namespace}`;
     let major = 0, minor = 0, patch = 0, increment = 0;
     let changed = true;

diff --git a/index.test.js b/index.test.js
@@ -549,5 +549,20 @@ test('Regular expressions can be used as minor tag', () => {
     repo.makeCommit('Second Commit SomeValue'); // 0.0.1+1
     expect(repo.runAction()).toMatch('Version is 0.1.0+0');
 
+    repo.clean();
+});
+
+test('Short tags disabled matches full tags', () => {
+    const repo = createTestRepo({ short_tags: 'false' }); // 0.0.0
+
+    repo.makeCommit('Initial Commit');
+    repo.makeCommit('Second Commit');
+    repo.makeCommit('Third Commit');
+    repo.exec('git tag v1.2.3');
+
+    const result = repo.runAction();
+
+    expect(result).toMatch('Version is 1.2.3+0');
+
     repo.clean();
 });