From 03dc9556834b1bbe5b4931bcbff98fa902f32f92 Mon Sep 17 00:00:00 2001
From: Oliver Wipfli <oliver.wipfli@leichteralsluft.ch>
Date: Thu, 16 Jun 2022 00:14:06 +0200
Subject: [PATCH] Restrict cancel workflow (#330)

---
 .github/workflows/android-ci-pull.yml | 2 +-
 .github/workflows/android-ci.yml      | 2 +-
 .github/workflows/ios-ci.yml          | 2 +-
 .github/workflows/macos-ci.yml        | 2 +-
 .github/workflows/node-ci.yml         | 2 +-
 .github/workflows/qt-ci-windows.yml   | 2 +-
 .github/workflows/qt-ci.yml           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android-ci-pull.yml b/.github/workflows/android-ci-pull.yml
index 17c3ddcf6..3dab73eb7 100644
--- a/.github/workflows/android-ci-pull.yml
+++ b/.github/workflows/android-ci-pull.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     defaults:
       run:
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 4e6c362d1..11ece838f 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     defaults:
       run:
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index cea0bfeec..8275dc428 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: macos-10.15
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     env:
       BUILDTYPE: Debug
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
index c462d79e3..2a66c8eec 100644
--- a/.github/workflows/macos-ci.yml
+++ b/.github/workflows/macos-ci.yml
@@ -27,7 +27,7 @@ jobs:
   build:
     runs-on: macos-10.15
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     env:
       BUILDTYPE: Debug
diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 9f547c037..70c7e4c89 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -31,7 +31,7 @@ jobs:
           - ubuntu-18.04
     runs-on: ${{ matrix.os }}
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     env:
       BUILDTYPE: ${{github.ref == 'refs/heads/main' && 'Release' || 'Debug'}}
diff --git a/.github/workflows/qt-ci-windows.yml b/.github/workflows/qt-ci-windows.yml
index 6c82c1af4..9a23c1af6 100644
--- a/.github/workflows/qt-ci-windows.yml
+++ b/.github/workflows/qt-ci-windows.yml
@@ -29,7 +29,7 @@ jobs:
   build-core:
     runs-on: windows-latest
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     strategy:
       matrix:
diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml
index 543eed7e0..765897aef 100644
--- a/.github/workflows/qt-ci.yml
+++ b/.github/workflows/qt-ci.yml
@@ -55,7 +55,7 @@ jobs:
             qt_target: desktop
     runs-on: ${{ matrix.os }}
     concurrency: 
-      group: ${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     env:
       BUILD_TYPE: Debug