From 22f79bdb9eab5474d6644e66036db3d3daa79679 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin.bharambe@gmail.com>
Date: Thu, 31 Jul 2025 13:22:24 -0700
Subject: [PATCH] fix(ci): lets attempt another fix for concurrency

---
 .github/workflows/integration-tests.yml        | 5 +++--
 .github/workflows/integration-vision-tests.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 12e3af862..33e80d49c 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -37,13 +37,14 @@ on:
         default: ''
 
 concurrency:
-  # This creates three concurrency groups:
+  # Skip concurrency for pushes to main - each commit should be tested independently
+  # For other events, create concurrency groups:
   #   ${{ github.workflow }}-${{ github.ref }}-rerecord (for labeled events with re-record-tests label)
   #   ${{ github.workflow }}-${{ github.ref }}-replay (for all non-labeled events)
   #   ${{ github.workflow }}-${{ github.ref }}-no-run (for labeled events without re-record-tests label)
   # The "no-run" group ensures that irrelevant label events don't interfere with the real workflows.
   group: >-
-    ${{ github.workflow }}-${{ github.ref }}-${{
+    ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-${{
     github.event.action == 'labeled' && (
       contains(github.event.pull_request.labels.*.name, 're-record-tests') && 'rerecord' || 'no-run'
     ) || 'replay'
diff --git a/.github/workflows/integration-vision-tests.yml b/.github/workflows/integration-vision-tests.yml
index cad945045..759cde07e 100644
--- a/.github/workflows/integration-vision-tests.yml
+++ b/.github/workflows/integration-vision-tests.yml
@@ -29,13 +29,14 @@ on:
         default: ''
 
 concurrency:
-  # This creates three concurrency groups:
+  # Skip concurrency for pushes to main - each commit should be tested independently
+  # For other events, create concurrency groups:
   #   ${{ github.workflow }}-${{ github.ref }}-rerecord (for labeled events with re-record-tests label)
   #   ${{ github.workflow }}-${{ github.ref }}-replay (for all non-labeled events)
   #   ${{ github.workflow }}-${{ github.ref }}-no-run (for labeled events without re-record-tests label)
   # The "no-run" group ensures that irrelevant label events don't interfere with the real workflows.
   group: >-
-    ${{ github.workflow }}-${{ github.ref }}-${{
+    ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-${{
     github.event.action == 'labeled' && (
       contains(github.event.pull_request.labels.*.name, 're-record-tests') && 'rerecord' || 'no-run'
     ) || 'replay'