From 32b711ef23d7d290fa991201e2de08be4df147e7 Mon Sep 17 00:00:00 2001
From: Matt Galligan <matt.galligan@gmail.com>
Date: Wed, 25 Mar 2026 19:41:22 -0400
Subject: [PATCH] fix(ci): prevent spurious CI Summary failures after
 force-push [OS-616]

---
 .github/workflows/ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ae2f8581..2481a4cd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,12 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ci-${{ github.ref }}
+  # Cancel in-progress runs on PR branches (force-push from gt submit)
+  # but never on main where post-merge CI must complete.
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_API: ${{ secrets.TURBO_API }}
@@ -324,5 +330,5 @@ jobs:
           echo "| Test (App) | \`${{ needs.test-app.result }}\` |" >> "$GITHUB_STEP_SUMMARY"
 
       - name: Check for failures
-        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+        if: (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) && !cancelled()
         run: exit 1