From e9146f5ba44163423becc67db6b4b415145b09aa Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:18:56 +0100
Subject: [PATCH] [testing workflows] Update concurrency group for CI workflow
 (#50407)

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9eecfb8193..062ec146df9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,9 @@ on:
         type: string
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.ref }}-${{ inputs.trigger }}'
-  cancel-in-progress: ${{ github.ref != 'trunk' }}
+  # Cancel concurrent jobs but not for push event. For push use the run_id to have a unique group.
+  group: ci-${{ github.event_name == 'push' && github.run_id || github.event_name }}-${{ github.ref }}-${{ inputs.trigger }}
+  cancel-in-progress: true
 
 env:
   FORCE_COLOR: 1