From 807990b0c3c7d0e791472059193e6a874c236d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= <edwin.torok@cloud.com>
Date: Wed, 18 Sep 2024 10:50:46 +0100
Subject: [PATCH] [ci]: make concurrency group more unique
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We notice that required CI checks cancel themselves even when attempting to merge a single PR at a time.
That is probably because there are CI jobs run on both 'push' and 'merge_group'.

Try to make the concurrency group more unique by adding the github event name to the group key.

Signed-off-by: Edwin Török <edwin.torok@cloud.com>
---
 .github/workflows/main.yml        | 2 +-
 .github/workflows/other.yml       | 2 +-
 .github/workflows/shellcheck.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3f7e00a69f..580b27f6288 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ on:
   merge_group:
 
 concurrency: # On new push, cancel old workflows from the same PR, branch or tag:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{github.event_name}}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
index 52c73729594..d6ad9c849a6 100644
--- a/.github/workflows/other.yml
+++ b/.github/workflows/other.yml
@@ -9,7 +9,7 @@ on:
   merge_group:
 
 concurrency: # On new push, cancel old workflows from the same PR, branch or tag:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{github.event_name}}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/shellcheck.yaml b/.github/workflows/shellcheck.yaml
index 8be332ada23..b078eaba549 100644
--- a/.github/workflows/shellcheck.yaml
+++ b/.github/workflows/shellcheck.yaml
@@ -5,7 +5,7 @@ on:
   merge_group:
 
 concurrency:  # On new push, cancel old workflows from the same PR, branch or tag:
-  group: sc-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: sc-${{ github.workflow }}-${{github.event_name}}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs: