SCB-2205 Fix pull request and push trigger condition

apache · Mar 3, 2021 · ddadcce · ddadcce
1 parent 6033905
commit ddadcce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   pull_request_test:
-    if: ${{ github.event.issue.pull_request }}
+    if: ${{ github.event_name == 'pull_request' }}
     timeout-minutes: 180
     runs-on: ubuntu-20.04
     steps:
@@ -46,8 +46,8 @@ jobs:
         if: ${{ success() }}
         run: ./mvnw clean verify -B -f acceptance-tests -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs
 
-  push_master_test:
-    if: ${{ !github.event.issue.pull_request && github.event.repository.owner.login == 'apache' }}
+  push_test:
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
     timeout-minutes: 180
     runs-on: ubuntu-20.04
     steps: