fix: single commit branches: Do not fail on target main branches that…

… have single commit.
nrwl · Jan 4, 2023 · 133adb8 · 133adb8
1 parent 177b483
commit 133adb8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -13755,17 +13755,23 @@ let BASE_SHA;
         process.stdout.write('\n');
         process.stdout.write(`NOTE: You can instead make this a hard error by setting 'error-on-no-successful-workflow' on the action in your workflow.\n`);
 
-        BASE_SHA = execSync(`git rev-parse origin/${mainBranchName}~1`, { encoding: 'utf-8' });
+        let getBaseShaCommand = `git rev-parse origin/${mainBranchName}`;
+        const commitCountOutput = execSync(`git rev-list --count origin/${mainBranchName}`, { encoding: 'utf-8' });
+        const commitCount = parseInt(stripNewLineEndings(commitCountOutput), 10);
+        if (commitCount > 1) {
+          getBaseShaCommand = `${getBaseShaCommand}~1`;
+        }
+
+        BASE_SHA = execSync(getBaseShaCommand, { encoding: 'utf-8' });
         core.setOutput('noPreviousBuild', 'true');
       }
     } else {
       process.stdout.write('\n');
       process.stdout.write(`Found the last successful workflow run on 'origin/${mainBranchName}'\n`);
       process.stdout.write(`Commit: ${BASE_SHA}\n`);
     }
-  }
 
-  const stripNewLineEndings = sha => sha.replace('\n', '');
+  }
   core.setOutput('base', stripNewLineEndings(BASE_SHA));
   core.setOutput('head', stripNewLineEndings(HEAD_SHA));
 })();
@@ -13843,6 +13849,13 @@ async function commitExists(commitSha) {
   }
 }
 
+/**
+ * Strips LF line endings from given string
+ * @param {string} string
+ */
+function stripNewLineEndings(string) {
+  return string.replace('\n', '');
+}
 })();
 
 module.exports = __webpack_exports__;

diff --git a/find-successful-workflow.js b/find-successful-workflow.js
@@ -47,17 +47,23 @@ let BASE_SHA;
         process.stdout.write('\n');
         process.stdout.write(`NOTE: You can instead make this a hard error by setting 'error-on-no-successful-workflow' on the action in your workflow.\n`);
 
-        BASE_SHA = execSync(`git rev-parse origin/${mainBranchName}~1`, { encoding: 'utf-8' });
+        let getBaseShaCommand = `git rev-parse origin/${mainBranchName}`;
+        const commitCountOutput = execSync(`git rev-list --count origin/${mainBranchName}`, { encoding: 'utf-8' });
+        const commitCount = parseInt(stripNewLineEndings(commitCountOutput), 10);
+        if (commitCount > 1) {
+          getBaseShaCommand = `${getBaseShaCommand}~1`;
+        }
+
+        BASE_SHA = execSync(getBaseShaCommand, { encoding: 'utf-8' });
         core.setOutput('noPreviousBuild', 'true');
       }
     } else {
       process.stdout.write('\n');
       process.stdout.write(`Found the last successful workflow run on 'origin/${mainBranchName}'\n`);
       process.stdout.write(`Commit: ${BASE_SHA}\n`);
     }
-  }
 
-  const stripNewLineEndings = sha => sha.replace('\n', '');
+  }
   core.setOutput('base', stripNewLineEndings(BASE_SHA));
   core.setOutput('head', stripNewLineEndings(HEAD_SHA));
 })();
@@ -134,3 +140,11 @@ async function commitExists(commitSha) {
     return false;
   }
 }
+
+/**
+ * Strips LF line endings from given string
+ * @param {string} string
+ */
+function stripNewLineEndings(string) {
+  return string.replace('\n', '');
+}