Merge branch 'main' of https://github.com/aimane-chnaif/Expensify int…

…o issue-18781
Expensify · May 12, 2023 · 2e21e3d · 2e21e3d
2 parents 158f31e + 2376b77
commit 2e21e3d
Show file tree

Hide file tree

Showing 62 changed files with 964 additions and 451 deletions.
diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
@@ -619,6 +619,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -656,6 +656,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -623,6 +623,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -847,6 +847,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -782,6 +782,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js b/.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js
@@ -26,35 +26,53 @@ if (titleRegex) {
 }
 
 /**
- * Process a pull request and outputs it's merge commit hash.
+ * Output pull request merge actor.
  *
  * @param {Object} PR
  */
-function outputMergeCommitHash(PR) {
-    if (!_.isEmpty(PR)) {
-        console.log(`Found matching pull request: ${PR.html_url}`);
-        core.setOutput('MERGE_COMMIT_SHA', PR.merge_commit_sha);
+function outputMergeActor(PR) {
+    if (user === 'OSBotify') {
+        core.setOutput('MERGE_ACTOR', PR.merged_by.login);
     } else {
-        const err = new Error('Could not find matching pull request');
-        console.error(err);
-        core.setFailed(err);
+        core.setOutput('MERGE_ACTOR', user);
     }
 }
 
 /**
- * Process a pull request and outputs it's merge actor
+ * Output forked repo URL if PR includes changes from a fork.
  *
  * @param {Object} PR
  */
-function outputMergeActor(PR) {
+function outputForkedRepoUrl(PR) {
+    if (PR.head.repo.html_url === GithubUtils.APP_REPO_URL) {
+        core.setOutput('FORKED_REPO_URL', '');
+    } else {
+        core.setOutput('FORKED_REPO_URL', `${PR.head.repo.html_url}.git`);
+    }
+}
+
+/**
+ * Output pull request data.
+ *
+ * @param {Object} PR
+ */
+function outputPullRequestData(PR) {
+    core.setOutput('MERGE_COMMIT_SHA', PR.merge_commit_sha);
+    core.setOutput('HEAD_COMMIT_SHA', PR.head.sha);
+    core.setOutput('IS_MERGED', PR.merged);
+    outputMergeActor(PR);
+    outputForkedRepoUrl(PR);
+}
+
+/**
+ * Process a pull request and output its data.
+ *
+ * @param {Object} PR
+ */
+function processPullRequest(PR) {
     if (!_.isEmpty(PR)) {
         console.log(`Found matching pull request: ${PR.html_url}`);
-
-        if (user === 'OSBotify') {
-            core.setOutput('MERGE_ACTOR', PR.merged_by.login);
-        } else {
-            core.setOutput('MERGE_ACTOR', user);
-        }
+        outputPullRequestData(PR);
     } else {
         const err = new Error('Could not find matching pull request');
         console.error(err);
@@ -79,8 +97,7 @@ if (pullRequestNumber) {
             pull_number: pullRequestNumber,
         })
         .then(({data}) => {
-            outputMergeCommitHash(data);
-            outputMergeActor(data);
+            processPullRequest(data);
         })
         .catch(handleUnknownError);
 } else {
@@ -97,7 +114,6 @@ if (pullRequestNumber) {
             }),
         )
         .then(({data}) => {
-            outputMergeCommitHash(data);
-            outputMergeActor(data);
+            processPullRequest(data);
         });
 }
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -36,35 +36,53 @@ if (titleRegex) {
 }
 
 /**
- * Process a pull request and outputs it's merge commit hash.
+ * Output pull request merge actor.
  *
  * @param {Object} PR
  */
-function outputMergeCommitHash(PR) {
-    if (!_.isEmpty(PR)) {
-        console.log(`Found matching pull request: ${PR.html_url}`);
-        core.setOutput('MERGE_COMMIT_SHA', PR.merge_commit_sha);
+function outputMergeActor(PR) {
+    if (user === 'OSBotify') {
+        core.setOutput('MERGE_ACTOR', PR.merged_by.login);
     } else {
-        const err = new Error('Could not find matching pull request');
-        console.error(err);
-        core.setFailed(err);
+        core.setOutput('MERGE_ACTOR', user);
     }
 }
 
 /**
- * Process a pull request and outputs it's merge actor
+ * Output forked repo URL if PR includes changes from a fork.
  *
  * @param {Object} PR
  */
-function outputMergeActor(PR) {
+function outputForkedRepoUrl(PR) {
+    if (PR.head.repo.html_url === GithubUtils.APP_REPO_URL) {
+        core.setOutput('FORKED_REPO_URL', '');
+    } else {
+        core.setOutput('FORKED_REPO_URL', `${PR.head.repo.html_url}.git`);
+    }
+}
+
+/**
+ * Output pull request data.
+ *
+ * @param {Object} PR
+ */
+function outputPullRequestData(PR) {
+    core.setOutput('MERGE_COMMIT_SHA', PR.merge_commit_sha);
+    core.setOutput('HEAD_COMMIT_SHA', PR.head.sha);
+    core.setOutput('IS_MERGED', PR.merged);
+    outputMergeActor(PR);
+    outputForkedRepoUrl(PR);
+}
+
+/**
+ * Process a pull request and output its data.
+ *
+ * @param {Object} PR
+ */
+function processPullRequest(PR) {
     if (!_.isEmpty(PR)) {
         console.log(`Found matching pull request: ${PR.html_url}`);
-
-        if (user === 'OSBotify') {
-            core.setOutput('MERGE_ACTOR', PR.merged_by.login);
-        } else {
-            core.setOutput('MERGE_ACTOR', user);
-        }
+        outputPullRequestData(PR);
     } else {
         const err = new Error('Could not find matching pull request');
         console.error(err);
@@ -89,8 +107,7 @@ if (pullRequestNumber) {
             pull_number: pullRequestNumber,
         })
         .then(({data}) => {
-            outputMergeCommitHash(data);
-            outputMergeActor(data);
+            processPullRequest(data);
         })
         .catch(handleUnknownError);
 } else {
@@ -107,8 +124,7 @@ if (pullRequestNumber) {
             }),
         )
         .then(({data}) => {
-            outputMergeCommitHash(data);
-            outputMergeActor(data);
+            processPullRequest(data);
         });
 }
 
@@ -701,6 +717,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js
@@ -611,6 +611,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/isPullRequestMergeable/index.js b/.github/actions/javascript/isPullRequestMergeable/index.js
@@ -647,6 +647,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js
@@ -575,6 +575,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -751,6 +751,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/postTestBuildComment/index.js b/.github/actions/javascript/postTestBuildComment/index.js
@@ -619,6 +619,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -587,6 +587,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
@@ -654,6 +654,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/triggerWorkflowAndWait/index.js b/.github/actions/javascript/triggerWorkflowAndWait/index.js
@@ -752,6 +752,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
@@ -576,6 +576,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;

diff --git a/.github/libs/GithubUtils.js b/.github/libs/GithubUtils.js
@@ -535,6 +535,7 @@ class GithubUtils {
 module.exports = GithubUtils;
 module.exports.GITHUB_OWNER = GITHUB_OWNER;
 module.exports.APP_REPO = APP_REPO;
+module.exports.APP_REPO_URL = APP_REPO_URL;
 module.exports.STAGING_DEPLOY_CASH_LABEL = STAGING_DEPLOY_CASH_LABEL;
 module.exports.DEPLOY_BLOCKER_CASH_LABEL = DEPLOY_BLOCKER_CASH_LABEL;
 module.exports.APPLAUSE_BOT = APPLAUSE_BOT;