From c4657c68966fbdaa7290ec49201c8d2cda26cc5f Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 5 May 2021 10:20:07 +0200
Subject: Make use of concurrency cancel-in-progress

---
 .github/workflows/cancel_previous_runs.yml | 18 ------------------
 .github/workflows/face.yml                 |  4 ++++
 .github/workflows/fuzz.yml                 |  4 ++++
 .github/workflows/linux.yml                |  4 ++++
 .github/workflows/macosx.yml               |  4 ++++
 .github/workflows/windows.yml              |  4 ++++
 6 files changed, 20 insertions(+), 18 deletions(-)
 delete mode 100644 .github/workflows/cancel_previous_runs.yml

(limited to '.github')

diff --git a/.github/workflows/cancel_previous_runs.yml b/.github/workflows/cancel_previous_runs.yml
deleted file mode 100644
index de2463f62fa..00000000000
--- a/.github/workflows/cancel_previous_runs.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: cancel
-
-on:
-  workflow_run:
-    workflows: ['face', 'fuzz', 'linux', 'macosx', 'windows']
-    types: ['requested']
-
-jobs:
-  cancel-duplicate-workflow-runs:
-    name: Cancel Duplicate Workflow Runs
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: potiuk/cancel-workflow-runs@v4_7
-      name: Cancel Duplicate Workflow Runs
-      with:
-        cancelMode: allDuplicates
-        token: ${{ secrets.GITHUB_TOKEN }}
-        sourceRunId: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml
index 85c31c45928..f35ae8fbf95 100644
--- a/.github/workflows/face.yml
+++ b/.github/workflows/face.yml
@@ -7,6 +7,10 @@ on:
     - cron: '0 1 * * SUN'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 0ea405916c4..cd6894af8aa 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -7,6 +7,10 @@ on:
     - cron: '0 1 * * SUN'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9d300fcc9c6..76e4bd1f572 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -7,6 +7,10 @@ on:
     - cron: '0 1 * * SUN'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 43346a29f24..0eef65b4406 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -7,6 +7,10 @@ on:
     - cron: '0 1 * * SUN'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 49d6c54a772..3ac25e4e16f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,6 +7,10 @@ on:
     - cron: '0 1 * * SUN'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   msvc:
     strategy:
-- 
cgit v1.2.1