From a6f32aa76949015f0a4ac332f4b8a2b0d7c77e6e Mon Sep 17 00:00:00 2001
From: Andrew Dryga <andrew@dryga.com>
Date: Tue, 16 Apr 2024 10:41:13 -0600
Subject: [PATCH] chore(devops): Fix GH overriding main branch statuses (#4639)

---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/hotfix.yml  | 2 +-
 .github/workflows/publish.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a732de0b4..d14545a9c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,8 +19,8 @@ env:
 
 # Cancel old workflow runs if new code is pushed
 concurrency:
-  group: "ci-${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
+  group: "ci-${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: ${{ github.event_name != 'workflow_call' }}
 
 jobs:
   kotlin:
diff --git a/.github/workflows/hotfix.yml b/.github/workflows/hotfix.yml
index 11904365f..71e79d936 100644
--- a/.github/workflows/hotfix.yml
+++ b/.github/workflows/hotfix.yml
@@ -12,7 +12,7 @@ on:
         required: false
 
 concurrency:
-  group: "hotfix-production-${{ github.workflow }}-${{ github.ref }}"
+  group: "hotfix-production-${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: false
 
 jobs:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 767742c77..30b56db76 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ env:
   VERSION: "1.0.0"
 
 concurrency:
-  group: "cd-production-${{ github.workflow }}-${{ github.ref }}"
+  group: "publish-production-${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: false
 
 jobs: