From 6e61991846a13ce57cb71afddfc35975beaa4ed6 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Thu, 16 Mar 2023 17:24:04 +0100
Subject: [PATCH] [github] Properly cancel only relevant workflows from the
 matrix build

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/workflows/android-check.yaml | 2 +-
 .github/workflows/ios-check.yaml     | 2 +-
 .github/workflows/linux-check.yaml   | 2 +-
 .github/workflows/macos-check.yaml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml
index c7fa540fe5..67e9352705 100644
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -27,7 +27,7 @@ on:
 
 # Cancels previous jobs if the same branch or PR was updated again.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ matrix.flavor }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml
index 0814e7fa11..f7e0b7492c 100644
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -26,7 +26,7 @@ on:
 
 # Cancels previous jobs if the same branch or PR was updated again.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ matrix.buildType }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml
index 2a1b53f567..5982ef992b 100644
--- a/.github/workflows/linux-check.yaml
+++ b/.github/workflows/linux-check.yaml
@@ -24,7 +24,7 @@ on:
 
 # Cancels previous jobs if the same branch or PR was updated again.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/macos-check.yaml b/.github/workflows/macos-check.yaml
index 902555c7f2..75bf48cba5 100644
--- a/.github/workflows/macos-check.yaml
+++ b/.github/workflows/macos-check.yaml
@@ -24,7 +24,7 @@ on:
 
 # Cancels previous jobs if the same branch or PR was updated again.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ matrix.CMAKE_BUILD_TYPE }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs: