Merge branch 'main' into 289Adam289/48156-store-applied-filters

.github/actions/composite/buildAndroidE2EAPK/action.yml

@@ -51,7 +51,7 @@ runs:
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: "oracle"
         java-version: "17"

.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts

@@ -18,7 +18,7 @@ function run() {
             GitHubUtils.octokit.actions.listWorkflowRuns({
                 owner: CONST.GITHUB_OWNER,
                 repo: CONST.APP_REPO,
-                workflow_id: 'platformDeploy.yml',
+                workflow_id: 'deploy.yml',
                 event: 'push',
                 branch: tag,
             }),

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -12138,7 +12138,7 @@ function run() {
         GithubUtils_1.default.octokit.actions.listWorkflowRuns({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            workflow_id: 'platformDeploy.yml',
+            workflow_id: 'deploy.yml',
             event: 'push',
             branch: tag,
         }),

.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts

@@ -35,7 +35,7 @@ async function isReleaseValidBaseForEnvironment(releaseTag: string, isProduction
 }
 
 /**
- * Was a given platformDeploy workflow run successful on at least one platform?
+ * Was a given deploy workflow run successful on at least one platform?
  */
 async function wasDeploySuccessful(runID: number) {
     const jobsForWorkflowRun = (
@@ -82,7 +82,7 @@ async function run() {
 
         console.log(`Looking for PRs deployed to ${deployEnv} in ${inputTag}...`);
 
-        const completedDeploys = (
+        const platformDeploys = (
             await GithubUtils.octokit.actions.listWorkflowRuns({
                 owner: github.context.repo.owner,
                 repo: github.context.repo.repo,
@@ -95,6 +95,24 @@ async function run() {
             // because if a build fails on even one platform, then it will have the status 'failure'
             .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
 
+        const deploys = (
+            await GithubUtils.octokit.actions.listWorkflowRuns({
+                owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                workflow_id: 'deploy.yml',
+                status: 'completed',
+            })
+        ).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');
+
+        // W've combined platformDeploy.yml and deploy.yml
+        // TODO: Remove this once there are successful staging and production deploys using the new deploy.yml workflow
+        const completedDeploys = [...deploys, ...platformDeploys];
+        completedDeploys.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
+
         // 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();
 

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -11526,7 +11526,7 @@ async function isReleaseValidBaseForEnvironment(releaseTag, isProductionDeploy)
     return !isPrerelease;
 }
 /**
- * Was a given platformDeploy workflow run successful on at least one platform?
+ * Was a given deploy workflow run successful on at least one platform?
  */
 async function wasDeploySuccessful(runID) {
     const jobsForWorkflowRun = (await GithubUtils_1.default.octokit.actions.listJobsForWorkflowRun({
@@ -11566,7 +11566,7 @@ async function run() {
         const isProductionDeploy = !!(0, ActionUtils_1.getJSONInput)('IS_PRODUCTION_DEPLOY', { required: false }, false);
         const deployEnv = isProductionDeploy ? 'production' : 'staging';
         console.log(`Looking for PRs deployed to ${deployEnv} in ${inputTag}...`);
-        const completedDeploys = (await GithubUtils_1.default.octokit.actions.listWorkflowRuns({
+        const platformDeploys = (await GithubUtils_1.default.octokit.actions.listWorkflowRuns({
             owner: github.context.repo.owner,
             repo: github.context.repo.repo,
             // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -11576,6 +11576,20 @@ async function run() {
             // 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');
+        const deploys = (await GithubUtils_1.default.octokit.actions.listWorkflowRuns({
+            owner: github.context.repo.owner,
+            repo: github.context.repo.repo,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            workflow_id: 'deploy.yml',
+            status: 'completed',
+        })).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');
+        // W've combined platformDeploy.yml and deploy.yml
+        // TODO: Remove this once there are successful staging and production deploys using the new deploy.yml workflow
+        const completedDeploys = [...deploys, ...platformDeploys];
+        completedDeploys.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
         // 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();
         if (!lastSuccessfulDeploy) {

.github/scripts/validateActionsAndWorkflows.sh

@@ -45,7 +45,7 @@ for ((i=0; i < ${#WORKFLOWS[@]}; i++)); do
     # Skip linting e2e workflow due to bug here: https://github.com/SchemaStore/schemastore/issues/2579
     if [[ "$WORKFLOW" == './workflows/e2ePerformanceTests.yml'
           || "$WORKFLOW" == './workflows/testBuild.yml'
-          || "$WORKFLOW" == './workflows/platformDeploy.yml' ]]; then
+          || "$WORKFLOW" == './workflows/deploy.yml' ]]; then
       continue
     fi
 

.github/scripts/verifyRedirect.sh

@@ -32,6 +32,12 @@ while read -r line; do
     SOURCE_URL=${LINE_PARTS[0]}
     DEST_URL=${LINE_PARTS[1]}
 
+    # Make sure that the source and destination are not identical
+    if [[ "$SOURCE_URL" == "$DEST_URL" ]]; then
+        error "Source and destination URLs are identical: $SOURCE_URL"
+        exit 1
+    fi
+
     # Make sure the format of the line is as expected.
     if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
         error "Found a line with more than one comma: $line"