Try a different conditional

jspsych · Jan 17, 2025 · 14b2586 · 14b2586
1 parent 6079c29
commit 14b2586
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,12 +2,9 @@ name: build
 
 on: [push, pull_request]
 
-concurrency:
-  group: ci-${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
-  cancel-in-progress: true
-
 jobs:
   test:
+    if: github.event_name == 'push' && !contains(github.ref, '/merge') || github.event_name == 'pull_request'
     name: Build, lint, and test on Node.js ${{ matrix.node }}
     runs-on: ubuntu-latest
     strategy: