From e273dec53f7de1d1402c5b01cf7a539b5b8b25f5 Mon Sep 17 00:00:00 2001
From: Craigory Coppola <craigorycoppola@gmail.com>
Date: Wed, 30 Apr 2025 12:50:10 -0400
Subject: [PATCH] chore(repo): adjust concurrency to use unique groups for push
 events (#30946)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5305adde62..946e8612b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,8 +106,8 @@ jobs:
     runs-on: macos-latest
 
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: ${{ !contains(github.event_name, 'push')}}
+      group: ${{ github.workflow }}-${{ github.ref }}${{ contains(github.event_name, 'push') && format('-{0}', github.sha) || '' }}
+      cancel-in-progress: true
 
     env:
       NX_E2E_CI_CACHE_KEY: e2e-github-macos
@@ -118,7 +118,7 @@ jobs:
 
       - name: Log concurrency info
         run: |
-          echo "Concurrency group: ${{ github.workflow }}-${{ github.ref }}"
+          echo "Concurrency group: ${{ github.workflow }}-${{ github.ref }}${{ contains(github.event_name, 'push') && format('-{0}', github.sha) || '' }}"
           echo "Concurrency cancel-in-progress: ${{ !contains(github.event_name, 'push') }}"
           echo "Concurrency cancel-event-name: ${{ github.event_name }}"
         if: always()