From 14b2586db193d024d42cce9a8dda1c682846cf7e Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Fri, 17 Jan 2025 11:29:47 -0500
Subject: [PATCH] Try a different conditional

---
 .github/workflows/build.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4793ea8a..e875fba7 100644
--- 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: