Merge pull request #44 from nimblehq/bug/fix-deploy-workflow

Fix cannot deploy on master branch
nimblehq · Sep 24, 2020 · 231e24a · 231e24a
2 parents c7b0ec3 + 4778563
commit 231e24a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,16 +21,20 @@ env:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Cancel previous runs
         uses: styfle/[email protected]
         with:
           access_token: ${{ github.token }}
 
       - uses: actions/[email protected]
+        with:
+          ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 
       - uses: nimblehq/[email protected]
+        with:
+          ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 
       - name: Set HEROKU_APP
         run: |