revert back to old check and skip run if PR merge

lbluque · Sep 27, 2023 · 531abb7 · 531abb7
1 parent 25717f6
commit 531abb7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,6 +16,7 @@ on:
 
 jobs:
   test:
+    if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && !contains( github.event.head_commit.message, 'Merge pull request')) }}
     # Only 20.04 is known to work with scip 8.0.0
     runs-on: ubuntu-20.04
     strategy:
@@ -56,7 +57,7 @@ jobs:
           pytest tests --cov=smol --cov-report=xml
 
       - uses: actions/checkout@v4
-      - if: ${{ matrix.python_version == '3.11' && (github.event_name == 'pull_request' || (github.event_name == 'push' && !contains( github.event.head_commit.message, 'Merge pull request'))) }}
+      - if: matrix.python_version == '3.11' && github.event_name == 'push'
         name: codacy-coverage-reporter
         uses: codacy/codacy-coverage-reporter-action@v1
         with: