Switch to home-made triggerWorkflowAndWait JS action

Expensify · May 11, 2021 · 424180a · 424180a
1 parent 3ea9446
commit 424180a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -94,13 +94,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Automerge the version-bump PR to update main
-        uses: convictional/trigger-workflow-and-wait@6acf1632a9a81ff2ee5a5a809d6c0fa519eeed3e
+        uses: Expensify/Expensify.cash/.github/actions/triggerWorkflowAndWait@main
         with:
-          owner: Expensify
-          repo: Expensify.cash
-          github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          workflow_file_name: automerge.yml
-          inputs: '{ "PULL_REQUEST_NUMBER": "${{ needs.createNewVersion.outputs.PULL_REQUEST_NUMBER }}" }'
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          WORKFLOW: automerge.yml
+          INPUTS: '{ "PULL_REQUEST_NUMBER": "${{ needs.createNewVersion.outputs.PULL_REQUEST_NUMBER }}" }'
 
       # 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

diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
@@ -102,13 +102,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create new BUILD version
-        uses: convictional/trigger-workflow-and-wait@6acf1632a9a81ff2ee5a5a809d6c0fa519eeed3e
+        uses: Expensify/Expensify.cash/.github/actions/triggerWorkflowAndWait@main
         with:
-          owner: Expensify
-          repo: Expensify.cash
-          github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          workflow_file_name: createNewVersion.yml
-          inputs: '{ "SEMVER_LEVEL": "BUILD" }'
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          WORKFLOW: createNewVersion.yml
+          INPUTS: '{ "SEMVER_LEVEL": "BUILD" }'
 
       # TODO: only need to create this tag because of how the GitUtils work
       - name: Tag version

diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml
@@ -23,13 +23,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create new PATCH version
-        uses: convictional/trigger-workflow-and-wait@6acf1632a9a81ff2ee5a5a809d6c0fa519eeed3e
+        uses: Expensify/Expensify.cash/.github/actions/triggerWorkflowAndWait@main
         with:
-          owner: Expensify
-          repo: Expensify.cash
-          github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          workflow_file_name: createNewVersion.yml
-          inputs: '{ "SEMVER_LEVEL": "PATCH" }'
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          WORKFLOW: createNewVersion.yml
+          INPUTS: '{ "SEMVER_LEVEL": "PATCH" }'
 
       # TODO: only need to create this tag because of how the GitUtils work
       - name: Tag version

diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
@@ -70,13 +70,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create new BUILD version
-        uses: convictional/trigger-workflow-and-wait@6acf1632a9a81ff2ee5a5a809d6c0fa519eeed3e
+        uses: Expensify/Expensify.cash/.github/actions/triggerWorkflowAndWait@main
         with:
-          owner: Expensify
-          repo: Expensify.cash
-          github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          workflow_file_name: createNewVersion.yml
-          inputs: '{ "SEMVER_LEVEL": "BUILD" }'
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          WORKFLOW: createNewVersion.yml
+          INPUTS: '{ "SEMVER_LEVEL": "BUILD" }'
 
       # TODO: only need to create this tag because of how the GitUtils work
       - name: Tag version
@@ -137,10 +135,8 @@ jobs:
           pr_body: Update version to ${{ env.STAGING_VERSION }}
 
       - name: Automerge pull request to update staging
-        uses: convictional/trigger-workflow-and-wait@6acf1632a9a81ff2ee5a5a809d6c0fa519eeed3e
+        uses: Expensify/Expensify.cash/.github/actions/triggerWorkflowAndWait@main
         with:
-          owner: Expensify
-          repo: Expensify.cash
-          github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          workflow_file_name: automerge.yml
-          inputs: '{ "PULL_REQUEST_NUMBER": "${{ steps.createPullRequest.outputs.pr_number }}" }'
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          WORKFLOW: automerge.yml
+          INPUTS: '{ "PULL_REQUEST_NUMBER": "${{ steps.createPullRequest.outputs.pr_number }}" }'