Merge pull request #42166 from Expensify/andrew-hybrid-app-deploy

Add HybridApp deploy when we deploy staging
Expensify · Jun 3, 2024 · 9a63031 · 9a63031
2 parents 431f528 + 03a564d
commit 9a63031
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -352,6 +352,16 @@ jobs:
         env:
           CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
 
+  # Build a version of iOS and Android HybridApp if we are deploying to staging
+  hybridApp:
+    runs-on: ubuntu-latest
+    needs: validateActor
+    if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+    steps:
+      - name: 'Deploy HybridApp'
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: Expensify/Mobile-Deploy/.github/workflows/deploy.yml@main
+
   postSlackMessageOnFailure:
     name: Post a Slack message when any platform fails to build or deploy
     runs-on: ubuntu-latest

diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts
@@ -376,13 +376,26 @@ function assertPostGithubCommentJobExecuted(workflowResult: Step[], didExecute =
     });
 }
 
+function assertHybridAppJobExecuted(workflowResult: Step[], didExecute = true) {
+    const steps = [createStepAssertion('Deploy HybridApp', true, null, 'HYBRID_APP', 'Deploy HybridApp')] as const;
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+}
+
 export default {
     assertVerifyActorJobExecuted,
     assertDeployChecklistJobExecuted,
     assertAndroidJobExecuted,
     assertDesktopJobExecuted,
     assertIOSJobExecuted,
     assertWebJobExecuted,
+    assertHybridAppJobExecuted,
     assertPostSlackOnFailureJobExecuted,
     assertPostSlackOnSuccessJobExecuted,
     assertPostGithubCommentJobExecuted,

diff --git a/workflow_tests/mocks/platformDeployMocks.ts b/workflow_tests/mocks/platformDeployMocks.ts
@@ -199,6 +199,10 @@ const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
     PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK,
 ];
 
+// deploy hybridApp
+const PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCK = createMockStep('Deploy HybridApp', 'Deploy HybridApp', 'HYBRID_APP');
+const PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCKS = [PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCK];
+
 // post slack message on failure
 const PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK = createMockStep('Post Slack message on failure', 'Posting Slack message on platform deploy failure', 'POST_SLACK_FAIL', [
     'SLACK_WEBHOOK',
@@ -274,6 +278,7 @@ export default {
     PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
     PLATFORM_DEPLOY__IOS__STEP_MOCKS,
     PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+    PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCKS,
     PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
     PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
     PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,

diff --git a/workflow_tests/platformDeploy.test.ts b/workflow_tests/platformDeploy.test.ts
@@ -101,6 +101,7 @@ describe('test workflow platformDeploy', () => {
                     desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
                     iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
                     web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    hybridApp: mocks.PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCKS,
                     postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
                     postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
                     postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
@@ -125,6 +126,7 @@ describe('test workflow platformDeploy', () => {
                 assertions.assertDesktopJobExecuted(result, true, false);
                 assertions.assertIOSJobExecuted(result, true, false, true);
                 assertions.assertWebJobExecuted(result, true, false);
+                assertions.assertHybridAppJobExecuted(result, true);
                 assertions.assertPostSlackOnFailureJobExecuted(result, false);
                 assertions.assertPostSlackOnSuccessJobExecuted(result, true, false);
                 assertions.assertPostGithubCommentJobExecuted(result, true, false);
@@ -185,6 +187,7 @@ describe('test workflow platformDeploy', () => {
                     desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
                     iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
                     web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    hybridApp: mocks.PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCKS,
                     postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
                     postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
                     postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
@@ -209,6 +212,7 @@ describe('test workflow platformDeploy', () => {
                 assertions.assertDesktopJobExecuted(result, true, false);
                 assertions.assertIOSJobExecuted(result, true, false, true);
                 assertions.assertWebJobExecuted(result, true, false);
+                assertions.assertHybridAppJobExecuted(result, true);
                 assertions.assertPostSlackOnFailureJobExecuted(result, false);
                 assertions.assertPostSlackOnSuccessJobExecuted(result, true, false);
                 assertions.assertPostGithubCommentJobExecuted(result, true, false);
@@ -269,6 +273,7 @@ describe('test workflow platformDeploy', () => {
                     desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
                     iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
                     web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    hybridApp: mocks.PLATFORM_DEPLOY__HYBRID_APP__STEP_MOCKS,
                     postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
                     postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
                     postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
@@ -293,6 +298,7 @@ describe('test workflow platformDeploy', () => {
                 assertions.assertDesktopJobExecuted(result, false);
                 assertions.assertIOSJobExecuted(result, false);
                 assertions.assertWebJobExecuted(result, false);
+                assertions.assertHybridAppJobExecuted(result, false);
                 assertions.assertPostSlackOnFailureJobExecuted(result, false);
                 assertions.assertPostSlackOnSuccessJobExecuted(result, false);
                 assertions.assertPostGithubCommentJobExecuted(result, true, false, false);