Merge pull request #9611 from Expensify/Rory-CallableWorkflow

Expensify · Jun 28, 2022 · 7da6439 · 7da6439
2 parents 84f6bbe + 0705cca
commit 7da6439
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,14 +1,14 @@
 name: Lint JavaScript
 
 on:
-  workflow_dispatch:
+  workflow_call:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
 
 jobs:
   lint:
-    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
@@ -5,24 +5,18 @@ on:
     branches: [main]
 
 jobs:
+  lint:
+    uses: ./.github/workflows/lint.yml
+
+  test:
+    uses: ./.github/workflows/test.yml
+
   confirmPassingBuild:
     runs-on: ubuntu-latest
+    needs: [lint, test]
+    if: ${{ always() && (needs.lint.result == 'failure' || needs.test.result == 'failure') }}
 
     steps:
-      - name: Run lint
-        id: lint
-        uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main
-        with:
-          WORKFLOW: lint.yml
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-
-      - name: Run tests
-        id: tests
-        uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main
-        with:
-          WORKFLOW: test.yml
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-
       # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all
       # the other workflows with the same change
       - uses: 8398a7/action-slack@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,14 +1,14 @@
 name: Jest Unit Tests
 
 on:
-  workflow_dispatch:
+  workflow_call:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
 
 jobs:
   test:
-    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2