Merge pull request #4336 from Expensify/joe-fix-cp-bug

Update getPullRequestsMergedBetween to run pre-set string command
Expensify · Aug 6, 2021 · 27e9f06 · 27e9f06
2 parents 439b830 + f6c4615
commit 27e9f06
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/actions/createOrUpdateStagingDeploy/index.js b/.github/actions/createOrUpdateStagingDeploy/index.js
@@ -193,8 +193,10 @@ const {execSync} = __nccwpck_require__(3129);
  * @returns {Array}
  */
 function getPullRequestsMergedBetween(fromRef, toRef) {
+    const command = `git log --format="%s" ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
-    const localGitLogs = execSync(`git log --format="%s" ${fromRef}...${toRef}`).toString();
+    console.log('Running command: ', command);
+    const localGitLogs = execSync(command).toString();
     return _.map(
         [...localGitLogs.matchAll(/Merge pull request #(\d{1,6}) from (?!Expensify\/(?:master|main|version-))/g)],
         match => match[1],

diff --git a/.github/actions/getDeployPullRequestList/index.js b/.github/actions/getDeployPullRequestList/index.js
@@ -117,8 +117,10 @@ const {execSync} = __nccwpck_require__(3129);
  * @returns {Array}
  */
 function getPullRequestsMergedBetween(fromRef, toRef) {
+    const command = `git log --format="%s" ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
-    const localGitLogs = execSync(`git log --format="%s" ${fromRef}...${toRef}`).toString();
+    console.log('Running command: ', command);
+    const localGitLogs = execSync(command).toString();
     return _.map(
         [...localGitLogs.matchAll(/Merge pull request #(\d{1,6}) from (?!Expensify\/(?:master|main|version-))/g)],
         match => match[1],

diff --git a/.github/libs/GitUtils.js b/.github/libs/GitUtils.js
@@ -9,8 +9,10 @@ const {execSync} = require('child_process');
  * @returns {Array}
  */
 function getPullRequestsMergedBetween(fromRef, toRef) {
+    const command = `git log --format="%s" ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
-    const localGitLogs = execSync(`git log --format="%s" ${fromRef}...${toRef}`).toString();
+    console.log('Running command: ', command);
+    const localGitLogs = execSync(command).toString();
     return _.map(
         [...localGitLogs.matchAll(/Merge pull request #(\d{1,6}) from (?!Expensify\/(?:master|main|version-))/g)],
         match => match[1],