Fix logic for ignoring tag version matching

PaulHatch · Jan 23, 2021 · fccf695 · fccf695
1 parent 9475102
commit fccf695
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1248,8 +1248,8 @@ async function run() {
 
     if (currentTag) {
       let tagVersion = parseVersion(currentTag);
-      if (tagVersion[0] !== major &&
-        tagVersion[1] !== minor &&
+      if (tagVersion[0] !== major ||
+        tagVersion[1] !== minor ||
         tagVersion[2] !== patch) {
         [major, minor, patch] = tagVersion;
         increment = 0;

diff --git a/index.js b/index.js
@@ -227,8 +227,8 @@ async function run() {
 
     if (currentTag) {
       let tagVersion = parseVersion(currentTag);
-      if (tagVersion[0] !== major &&
-        tagVersion[1] !== minor &&
+      if (tagVersion[0] !== major ||
+        tagVersion[1] !== minor ||
         tagVersion[2] !== patch) {
         [major, minor, patch] = tagVersion;
         increment = 0;

diff --git a/index.test.js b/index.test.js
@@ -510,7 +510,7 @@ test('Increment not affected by matching tag', () => {
 
     repo.makeCommit('Initial Commit'); // 0.0.1+0
     repo.makeCommit('Second Commit'); // 0.0.1+1
-    repo.exec('git tag 1.0.0');
+    repo.exec('git tag 0.0.1');
     expect(repo.runAction()).toMatch('Version is 0.0.1+1');
 
     repo.clean();