From 2d179e12bd44c41aa88c041df8d757b94afcae81 Mon Sep 17 00:00:00 2001
From: Matt Borland <matt@mattborland.com>
Date: Wed, 21 Oct 2026 15:00:16 -0400
Subject: [PATCH] For PRs kill in-progress testing on new pushes []

---
 .github/workflows/acknowledg-forge.yml   | 8 ++++++++
 .github/workflows/build-and-test-ci.yml  | 4 ++++
 .github/workflows/issue-templates.yml    | 4 ++++
 .github/workflows/strict-build-check.yml | 4 ++++
 .github/workflows/typecheck-python.yml   | 4 ++++
 5 files changed, 24 insertions(+)

diff --git a/.github/workflows/acknowledg-forge.yml b/.github/workflows/acknowledg-forge.yml
index 7727c9096d..dce391b24c 100644
--- a/.github/workflows/acknowledg-forge.yml
+++ b/.github/workflows/acknowledg-forge.yml
@@ -33,6 +33,14 @@ on:
   # Also run by acknowledg-forge-deploy before publishing an image.
   workflow_call:
 
+# A new push to a pull request cancels its in-progress run. Pushes to main are
+# grouped per commit, so every merged commit is still tested in full. When
+# called from acknowledg-forge-deploy, github.workflow is the caller's name,
+# so that run never shares a group with this workflow's own run on the push.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
diff --git a/.github/workflows/build-and-test-ci.yml b/.github/workflows/build-and-test-ci.yml
index 3d5dbdb9f9..e3fb19fe9a 100644
--- a/.github/workflows/build-and-test-ci.yml
+++ b/.github/workflows/build-and-test-ci.yml
@@ -32,6 +32,10 @@ on:
       - main
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   prepare:
     name: Prepare run timestamp
diff --git a/.github/workflows/issue-templates.yml b/.github/workflows/issue-templates.yml
index 9c19aa9077..479836c3d3 100644
--- a/.github/workflows/issue-templates.yml
+++ b/.github/workflows/issue-templates.yml
@@ -24,6 +24,10 @@ on:
       - .github/workflows/issue-templates.yml
       - dev_tools/bin/edg-check-issue-templates
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
diff --git a/.github/workflows/strict-build-check.yml b/.github/workflows/strict-build-check.yml
index 04817a2dba..c9adac7932 100644
--- a/.github/workflows/strict-build-check.yml
+++ b/.github/workflows/strict-build-check.yml
@@ -14,6 +14,10 @@ on:
       - main
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   windows-msvc-release:
     name: Windows MSVC release
diff --git a/.github/workflows/typecheck-python.yml b/.github/workflows/typecheck-python.yml
index 263e645543..8c42801f1e 100644
--- a/.github/workflows/typecheck-python.yml
+++ b/.github/workflows/typecheck-python.yml
@@ -16,6 +16,10 @@ on:
       - main
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   typecheck:
     name: typecheck-python (${{ matrix.python-version }})