Allow GitHub Actions to cancel in-progress workflows

Also ensures job names match concurrency group names
alphagov · Nov 19, 2023 · bf20a74 · bf20a74
1 parent 8a8d2ea
commit bf20a74
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
@@ -9,8 +9,12 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: integration-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
-  test-saucelabs:
+  integration:
     name: Build & test
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/saucelabs.yaml b/.github/workflows/saucelabs.yaml
@@ -1,8 +1,5 @@
 name: Cross-browser tests
 
-# Our Sauce Labs account only allows 5 tests to run at a time.
-concurrency: saucelabs
-
 on:
   pull_request:
 
@@ -12,8 +9,11 @@ on:
 
   workflow_dispatch:
 
+# Our Sauce Labs account only allows 5 tests to run at a time.
+concurrency: saucelabs
+
 jobs:
-  test-saucelabs:
+  saucelabs:
     name: Build & test (with Sauce Labs)
     runs-on: ubuntu-latest
     timeout-minutes: 15

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,8 +9,12 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: tests-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
-  build:
+  test:
     name: Build & basic tests
     runs-on: ubuntu-latest