From 37da3b81026a59b1c39c1aec5449119347c9b628 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Fri, 10 Apr 2026 13:26:48 -0700
Subject: [PATCH 1/3] Fix erroring host report on cancellation

---
 .github/workflows/ci-host.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index 18f260d76fa..5136410efd8 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -317,7 +317,7 @@ jobs:
 
   host-merge-reports-and-publish:
     name: Merge Host reports and publish
-    if: ${{ !cancelled() }}
+    if: ${{ !cancelled() && needs.host-test.result != 'skipped' }}
     concurrency:
       group: host-merge-reports-and-publish-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true

From 5506e31fde37fb98c24d51ecee4e82ebf14ee6c8 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Fri, 10 Apr 2026 13:26:59 -0700
Subject: [PATCH 2/3] Add concurrency parameter for test-web-assets

---
 .github/workflows/ci-host.yaml             | 1 +
 .github/workflows/ci-software-factory.yaml | 2 ++
 .github/workflows/ci.yaml                  | 2 ++
 .github/workflows/test-web-assets.yaml     | 6 +++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index 5136410efd8..aedc9666077 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -73,6 +73,7 @@ jobs:
     name: Build test web assets
     uses: ./.github/workflows/test-web-assets.yaml
     with:
+      caller: ci-host
       skip_catalog: true
     concurrency:
       group: ci-host-test-web-assets-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/ci-software-factory.yaml b/.github/workflows/ci-software-factory.yaml
index 7644357054b..4ff5dfd451e 100644
--- a/.github/workflows/ci-software-factory.yaml
+++ b/.github/workflows/ci-software-factory.yaml
@@ -35,6 +35,8 @@ jobs:
   test-web-assets:
     name: Build test web assets
     uses: ./.github/workflows/test-web-assets.yaml
+    with:
+      caller: ci-software-factory
 
   software-factory-test:
     name: Software Factory Tests
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c2dec33f0b7..52c55dabbe8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -121,6 +121,8 @@ jobs:
     needs: change-check
     if: needs.change-check.outputs.boxel == 'true' || needs.change-check.outputs.boxel-ui == 'true' || needs.change-check.outputs.matrix == 'true' || needs.change-check.outputs.realm-server == 'true' || needs.change-check.outputs.vscode-boxel-tools == 'true' || needs.change-check.outputs.workspace-sync-cli == 'true' || github.ref == 'refs/heads/main' || needs.change-check.outputs.run_all == 'true'
     uses: ./.github/workflows/test-web-assets.yaml
+    with:
+      caller: ci
     concurrency:
       group: ci-test-web-assets-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
diff --git a/.github/workflows/test-web-assets.yaml b/.github/workflows/test-web-assets.yaml
index 51796c41ecc..f20b5ab5cad 100644
--- a/.github/workflows/test-web-assets.yaml
+++ b/.github/workflows/test-web-assets.yaml
@@ -3,6 +3,10 @@ name: Build Test Web Assets
 on:
   workflow_call:
     inputs:
+      caller:
+        description: Unique identifier for the calling workflow (used in concurrency group to prevent cross-workflow cancellation)
+        required: true
+        type: string
       skip_catalog:
         description: Build host test assets with catalog skipped
         required: false
@@ -24,7 +28,7 @@ jobs:
     name: Build and cache test web assets
     runs-on: ubuntu-latest
     concurrency:
-      group: test-web-assets-${{ github.ref }}-${{ github.sha }}
+      group: test-web-assets-${{ inputs.caller }}-${{ github.ref }}-${{ github.sha }}
       cancel-in-progress: false
 
     outputs:

From ad726ad4d91cfc51b9df4618c7886d55b8963953 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Mon, 13 Apr 2026 08:44:16 -0500
Subject: [PATCH 3/3] Fix conditional for summary job

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/ci-host.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index aedc9666077..68745ca84c7 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -318,7 +318,7 @@ jobs:
 
   host-merge-reports-and-publish:
     name: Merge Host reports and publish
-    if: ${{ !cancelled() && needs.host-test.result != 'skipped' }}
+    if: ${{ !cancelled() && (needs.host-test.result == 'success' || needs.host-test.result == 'failure') }}
     concurrency:
       group: host-merge-reports-and-publish-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true