Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…

…/45166-report-field-list-values-pattern-a
brunovjk · Aug 12, 2024 · 4cb0191 · 4cb0191
2 parents 9ff01cc + cc2efc6
commit 4cb0191
Show file tree

Hide file tree

Showing 362 changed files with 4,722 additions and 10,768 deletions.
diff --git a/.github/.eslintrc.js b/.github/.eslintrc.js
@@ -7,5 +7,6 @@ module.exports = {
         'no-await-in-loop': 'off',
         'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
         'no-continue': 'off',
+        'no-restricted-imports': 'off',
     },
 };
diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
@@ -17017,6 +17017,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -12258,6 +12258,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -11541,6 +11541,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -14353,6 +14353,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
@@ -11502,6 +11502,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
@@ -19,26 +19,32 @@ async function run() {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 workflow_id: 'platformDeploy.yml',
                 status: 'completed',
-                event: isProductionDeploy ? 'release' : 'push',
             })
         ).data.workflow_runs
             // Note: we filter out cancelled runs instead of looking only for success runs
             // because if a build fails on even one platform, then it will have the status 'failure'
             .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
 
-        // Find the most recent deploy workflow for which at least one of the build jobs finished successfully.
+        // Find the most recent deploy workflow targeting the correct environment, for which at least one of the build jobs finished successfully
         let lastSuccessfulDeploy = completedDeploys.shift();
         while (
-            lastSuccessfulDeploy &&
-            !(
-                await GithubUtils.octokit.actions.listJobsForWorkflowRun({
+            lastSuccessfulDeploy?.head_branch &&
+            ((
+                await GithubUtils.octokit.repos.getReleaseByTag({
                     owner: github.context.repo.owner,
                     repo: github.context.repo.repo,
-                    // eslint-disable-next-line @typescript-eslint/naming-convention
-                    run_id: lastSuccessfulDeploy.id,
-                    filter: 'latest',
+                    tag: lastSuccessfulDeploy.head_branch,
                 })
-            ).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success')
+            ).data.prerelease === isProductionDeploy ||
+                !(
+                    await GithubUtils.octokit.actions.listJobsForWorkflowRun({
+                        owner: github.context.repo.owner,
+                        repo: github.context.repo.repo,
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        run_id: lastSuccessfulDeploy.id,
+                        filter: 'latest',
+                    })
+                ).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success'))
         ) {
             console.log(`Deploy was not a success: ${lastSuccessfulDeploy.html_url}, looking at the next one`);
             lastSuccessfulDeploy = completedDeploys.shift();

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -11514,21 +11514,25 @@ async function run() {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             workflow_id: 'platformDeploy.yml',
             status: 'completed',
-            event: isProductionDeploy ? 'release' : 'push',
         })).data.workflow_runs
             // Note: we filter out cancelled runs instead of looking only for success runs
             // because if a build fails on even one platform, then it will have the status 'failure'
             .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
-        // Find the most recent deploy workflow for which at least one of the build jobs finished successfully.
+        // Find the most recent deploy workflow targeting the correct environment, for which at least one of the build jobs finished successfully
         let lastSuccessfulDeploy = completedDeploys.shift();
-        while (lastSuccessfulDeploy &&
-            !(await GithubUtils_1.default.octokit.actions.listJobsForWorkflowRun({
+        while (lastSuccessfulDeploy?.head_branch &&
+            ((await GithubUtils_1.default.octokit.repos.getReleaseByTag({
                 owner: github.context.repo.owner,
                 repo: github.context.repo.repo,
-                // eslint-disable-next-line @typescript-eslint/naming-convention
-                run_id: lastSuccessfulDeploy.id,
-                filter: 'latest',
-            })).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success')) {
+                tag: lastSuccessfulDeploy.head_branch,
+            })).data.prerelease === isProductionDeploy ||
+                !(await GithubUtils_1.default.octokit.actions.listJobsForWorkflowRun({
+                    owner: github.context.repo.owner,
+                    repo: github.context.repo.repo,
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    run_id: lastSuccessfulDeploy.id,
+                    filter: 'latest',
+                })).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success'))) {
             console.log(`Deploy was not a success: ${lastSuccessfulDeploy.html_url}, looking at the next one`);
             lastSuccessfulDeploy = completedDeploys.shift();
         }
@@ -11636,6 +11640,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js
@@ -2769,6 +2769,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -11604,6 +11604,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',

diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js
@@ -11502,6 +11502,7 @@ const CONST = {
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
         HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
     ACTIONS: {
         CREATED: 'created',