Replace cancel-builds-on-update by concurrency feature in the GitHub CI

diff --git a/.github/workflows/cancelling.yml b/.github/workflows/cancelling.yml
deleted file mode 100644 (file)
index 8134ce9..0000000
--- a/.github/workflows/cancelling.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: cancel-duplicates
-on:
-  workflow_run:
-    workflows: ['github-docker', 'github-linux', 'github-OSX', 'github-windows', 'indent']
-    types: ['requested']
-
-jobs:
-  cancel-duplicate-workflow-runs:
-    name: "Cancel duplicate workflow runs"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: potiuk/cancel-workflow-runs@master
-        name: "Cancel duplicate workflow runs"
-        with:
-          cancelMode: duplicates
-          cancelFutureDuplicates: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-          sourceRunId: ${{ github.event.workflow_run.id }}
-          notifyPRCancel: true

diff --git a/.github/workflows/indent.yml b/.github/workflows/indent.yml
index be63f4b8ec63bc2bec59476d4259877f599d50c1..eae7be5a0f9a33e083f99757dc7780b0a57076c3 100644 (file)
--- a/.github/workflows/indent.yml
+++ b/.github/workflows/indent.yml
@@ -2,6 +2,10 @@ name: indent
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
 jobs:
   indent:
     # run the indent checks

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8ae6a80ef94ad91a905f5cae8040cbc3aa2008a5..dc2282f2c17acfba9be5b56a1148fac6d34ce01c 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -2,6 +2,10 @@ name: github-linux
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
 jobs:
   linux-release-serial:
     # simple serial release build using g++

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 9201b02928e2b85c3f6c6f1740d3a0e4900478df..fce0866b32a2c92d449a54cb83fdd25ce32803de 100644 (file)
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -2,6 +2,10 @@ name: github-OSX
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
 jobs:
   osx-serial:
     # simple serial build using apple clang

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d4171b78d2947ae784815bd52746a1395c3bf39f..7af8f712aa32df436793c1b8b92c1a3857bcbe72 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -2,6 +2,10 @@ name: github-windows
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
 jobs:
   windows-serial:
     # Serial build on Windows