From 92e99ac4b72b138cf33873b63fd229dacbae0f5f Mon Sep 17 00:00:00 2001
From: Martijn Govers <Martijn.Govers@Alliander.com>
Date: Thu, 26 Sep 2024 14:19:07 +0200
Subject: [PATCH] fix concurrency different way

Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
---
 .github/workflows/check-code-quality.yml | 2 +-
 .github/workflows/citations.yml          | 2 +-
 .github/workflows/clang-tidy.yml         | 4 ++--
 .github/workflows/main.yml               | 4 ++--
 .github/workflows/nightly.yml            | 2 +-
 .github/workflows/reuse-compliance.yml   | 2 +-
 .github/workflows/sonar.yml              | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check-code-quality.yml b/.github/workflows/check-code-quality.yml
index 96227e839..8f3076925 100644
--- a/.github/workflows/check-code-quality.yml
+++ b/.github/workflows/check-code-quality.yml
@@ -21,7 +21,7 @@ on:
   merge_group:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/citations.yml b/.github/workflows/citations.yml
index 83771318a..269d7d949 100644
--- a/.github/workflows/citations.yml
+++ b/.github/workflows/citations.yml
@@ -21,7 +21,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index b3587c08d..87b6c597b 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -35,8 +35,8 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name != 'workflow_call' }}  # parent workflow dictates concurrency
 
 jobs:
   clang-tidy:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 75a925d57..13ac2de92 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,8 +26,8 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name != 'workflow_call' }}  # parent workflow dictates concurrency
 
 
 jobs:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 328a9a057..9a97673a0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -11,7 +11,7 @@ on:
     - cron: "0 2 * * *" # Based on UTC time
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/reuse-compliance.yml b/.github/workflows/reuse-compliance.yml
index 092c88c4a..e28c6605d 100644
--- a/.github/workflows/reuse-compliance.yml
+++ b/.github/workflows/reuse-compliance.yml
@@ -15,7 +15,7 @@ on:
   merge_group:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 246cbea77..ff1349b57 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -15,7 +15,7 @@ on:
   merge_group:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: