Merge pull request #3909 from Expensify/Rory-ImproveLogsOfStagingDepl…

…oyCash [No QA] Add version to mergedPR logs
Expensify · Jul 7, 2021 · bcbbda0 · bcbbda0
2 parents b2a932f + ced59c3
commit bcbbda0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js b/.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js
@@ -61,10 +61,8 @@ const run = function () {
             if (shouldCreateNewStagingDeployCash) {
                 // Find the list of PRs merged between the last StagingDeployCash and the new version
                 const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, newVersion);
-                console.log(
-                    'The following PRs have been merged between the previous StagingDeployCash and new version:',
-                    mergedPRs,
-                );
+                // eslint-disable-next-line max-len
+                console.log(`The following PRs have been merged between the previous StagingDeployCash (${previousStagingDeployCashData.tag}) and new version (${newVersion}):`, mergedPRs);
 
                 // TODO: if there are open DeployBlockers and we are opening a new checklist,
                 //  then we should close / remove the DeployBlockerCash label from those
@@ -90,10 +88,8 @@ const run = function () {
 
             // Find the list of PRs merged between the last StagingDeployCash and the new version
             const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, tag);
-            console.log(
-                'The following PRs have been merged between the previous StagingDeployCash and new version:',
-                mergedPRs,
-            );
+            // eslint-disable-next-line max-len
+            console.log(`The following PRs have been merged between the previous StagingDeployCash (${previousStagingDeployCashData.tag}) and new version (${tag}):`, mergedPRs);
 
             // Generate the PR list, preserving the previous state of `isVerified` for existing PRs
             const PRList = _.sortBy(

diff --git a/.github/actions/createOrUpdateStagingDeploy/index.js b/.github/actions/createOrUpdateStagingDeploy/index.js
@@ -71,10 +71,8 @@ const run = function () {
             if (shouldCreateNewStagingDeployCash) {
                 // Find the list of PRs merged between the last StagingDeployCash and the new version
                 const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, newVersion);
-                console.log(
-                    'The following PRs have been merged between the previous StagingDeployCash and new version:',
-                    mergedPRs,
-                );
+                // eslint-disable-next-line max-len
+                console.log(`The following PRs have been merged between the previous StagingDeployCash (${previousStagingDeployCashData.tag}) and new version (${newVersion}):`, mergedPRs);
 
                 // TODO: if there are open DeployBlockers and we are opening a new checklist,
                 //  then we should close / remove the DeployBlockerCash label from those
@@ -100,10 +98,8 @@ const run = function () {
 
             // Find the list of PRs merged between the last StagingDeployCash and the new version
             const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, tag);
-            console.log(
-                'The following PRs have been merged between the previous StagingDeployCash and new version:',
-                mergedPRs,
-            );
+            // eslint-disable-next-line max-len
+            console.log(`The following PRs have been merged between the previous StagingDeployCash (${previousStagingDeployCashData.tag}) and new version (${tag}):`, mergedPRs);
 
             // Generate the PR list, preserving the previous state of `isVerified` for existing PRs
             const PRList = _.sortBy(