From e9978f3bbeb86e114090437dd2e27bf6cb0632c5 Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Wed, 8 May 2024 11:37:25 +0100
Subject: [PATCH 1/2] Github Actions: cancel-in-progress

---
 .github/workflows/build_docker.yaml   | 3 +++
 .github/workflows/citation_file.yaml  | 3 +++
 .github/workflows/codeql-analysis.yml | 3 +++
 .github/workflows/conda.yml           | 3 +++
 .github/workflows/cos7_testing.yml    | 3 +++
 .github/workflows/docs.yml            | 3 +++
 .github/workflows/license_check.yaml  | 3 +++
 .github/workflows/u18_testing.yml     | 3 +++
 .github/workflows/windows.yml         | 3 +++
 9 files changed, 27 insertions(+)

diff --git a/.github/workflows/build_docker.yaml b/.github/workflows/build_docker.yaml
index a1666010a78..18c8b67418b 100644
--- a/.github/workflows/build_docker.yaml
+++ b/.github/workflows/build_docker.yaml
@@ -16,6 +16,9 @@ on:
     branches:
       - 'main'
     types: [ labeled ]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/citation_file.yaml b/.github/workflows/citation_file.yaml
index 4825f6db206..eddd3f1a709 100644
--- a/.github/workflows/citation_file.yaml
+++ b/.github/workflows/citation_file.yaml
@@ -4,6 +4,9 @@ on:
       - CITATION.cff
     workflow_dispatch:
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 name: CITATION.cff
 jobs:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bc596f6d363..f6032fb9a9a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -11,6 +11,9 @@ on:
   schedule:
     - cron: '0 0 * * 1'
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   analyze:
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 68903d92d9c..0bd790bfd8a 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -11,6 +11,9 @@ on:
       - '!docs/**'
   release:
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
diff --git a/.github/workflows/cos7_testing.yml b/.github/workflows/cos7_testing.yml
index 3d7b59f22da..1e0edd2c610 100644
--- a/.github/workflows/cos7_testing.yml
+++ b/.github/workflows/cos7_testing.yml
@@ -10,6 +10,9 @@ on:
       - '**'
       - '!docs/**'
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a9bb9ec9ad2..504db338080 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -8,6 +8,9 @@ on:
   pull_request:
   release:
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
diff --git a/.github/workflows/license_check.yaml b/.github/workflows/license_check.yaml
index 924f660905e..b84942a6726 100644
--- a/.github/workflows/license_check.yaml
+++ b/.github/workflows/license_check.yaml
@@ -7,6 +7,9 @@ on:
     - 'release-*'
   pull_request:
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
diff --git a/.github/workflows/u18_testing.yml b/.github/workflows/u18_testing.yml
index 76baf26ebfa..b2f62cd4c44 100644
--- a/.github/workflows/u18_testing.yml
+++ b/.github/workflows/u18_testing.yml
@@ -10,6 +10,9 @@ on:
       - '**'
       - '!docs/**'
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 18689dfacd8..b2f7c558a18 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,6 +11,9 @@ on:
       - '!docs/**'
   release:
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:

From baa5715192310a393e450e8e53355f0fda8a1157 Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Wed, 8 May 2024 11:41:09 +0100
Subject: [PATCH 2/2] Update release notes

---
 docs/release_notes/next/dev-2195-cancel-in-progress | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/release_notes/next/dev-2195-cancel-in-progress

diff --git a/docs/release_notes/next/dev-2195-cancel-in-progress b/docs/release_notes/next/dev-2195-cancel-in-progress
new file mode 100644
index 00000000000..6d6af241b01
--- /dev/null
+++ b/docs/release_notes/next/dev-2195-cancel-in-progress
@@ -0,0 +1 @@
+#2196 : Cancel in progress test runs when new commit pushed