From 7f880f400eae602e2ee1116c60bc11d7e9dcee26 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 16:15:31 -0700
Subject: [PATCH 1/9] ci: Add more concurrency cancellation

---
 .github/workflows/ci-host.yaml     | 6 ++++++
 .github/workflows/ci.yaml          | 3 +++
 .github/workflows/diff-skills.yaml | 3 +++
 .github/workflows/preview-host.yml | 3 +++
 .github/workflows/yaml-lint.yml    | 5 ++++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index 94d5382c31d..e8eee221fc6 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -30,6 +30,9 @@ jobs:
     uses: ./.github/workflows/test-web-assets.yaml
     with:
       skip_catalog: true
+    concurrency:
+      group: test-web-assets-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
 
   host-test:
     name: Host Tests
@@ -191,6 +194,9 @@ jobs:
   host-percy-finalize:
     name: Finalise Percy
     if: always()
+    concurrency:
+      group: host-percy-finalize-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     needs: host-test
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c981e1347ff..7a20a48a9f4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -123,6 +123,9 @@ 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.software-factory == '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
+    concurrency:
+      group: test-web-assets-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
 
   ai-bot-test:
     name: AI bot Tests
diff --git a/.github/workflows/diff-skills.yaml b/.github/workflows/diff-skills.yaml
index 49ff65da7c1..f86f8362884 100644
--- a/.github/workflows/diff-skills.yaml
+++ b/.github/workflows/diff-skills.yaml
@@ -11,3 +11,6 @@ jobs:
   diff-skills:
     uses: cardstack/gh-actions/.github/workflows/diff-skills.yml@main
     secrets: inherit
+    concurrency:
+      group: diff-skills-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
diff --git a/.github/workflows/preview-host.yml b/.github/workflows/preview-host.yml
index 7bfd627a97c..b7b969aa44d 100644
--- a/.github/workflows/preview-host.yml
+++ b/.github/workflows/preview-host.yml
@@ -23,6 +23,9 @@ jobs:
   check-if-requires-preview:
     name: Check if a preview deploy is required
     runs-on: ubuntu-latest
+    concurrency:
+      group: check-if-requires-preview-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     outputs:
       boxel-host-files-changed: ${{ steps.boxel-host-files-that-changed.outputs.any_changed }}
     steps:
diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
index e79bc3dfb34..47eeaeaf4df 100644
--- a/.github/workflows/yaml-lint.yml
+++ b/.github/workflows/yaml-lint.yml
@@ -8,8 +8,11 @@ on:
 
 jobs:
   lint:
-    name: Lint
+    name: Lint YAML
     runs-on: ubuntu-latest
+    concurrency:
+      group: lint-yaml-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
       - uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # 3.1.1

From d78d9e6fcc79f9672faf720c2c12ada698a93dee Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 16:43:26 -0700
Subject: [PATCH 2/9] Add workflow prefixes

---
 .github/workflows/ci-host.yaml | 2 +-
 .github/workflows/ci.yaml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index e8eee221fc6..e65640282de 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -31,7 +31,7 @@ jobs:
     with:
       skip_catalog: true
     concurrency:
-      group: test-web-assets-${{ github.head_ref || github.run_id }}
+      group: ci-host-test-web-assets-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
 
   host-test:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7a20a48a9f4..1662a4ae21a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -124,7 +124,7 @@ jobs:
     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.software-factory == '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
     concurrency:
-      group: test-web-assets-${{ github.head_ref || github.run_id }}
+      group: ci-test-web-assets-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
 
   ai-bot-test:

From 4fb0e6551ff5b014cd53a57900a8cdea2abf995a Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 16:46:18 -0700
Subject: [PATCH 3/9] Add cancellation for host report

---
 .github/workflows/ci-host.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index e65640282de..19b4087ec3a 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -214,6 +214,9 @@ jobs:
   host-merge-reports-and-publish:
     name: Merge Host reports and publish
     if: always()
+    concurrency:
+      group: host-merge-reports-and-publish-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     needs: host-test
     runs-on: ubuntu-latest
 

From ac3c4e2a055857d7b603325f6abd6acf2288bef1 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 16:49:59 -0700
Subject: [PATCH 4/9] Add cancellation for preview comment

---
 .github/workflows/preview-comment.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/preview-comment.yml b/.github/workflows/preview-comment.yml
index 6a23e19ffb0..71f0d6438c8 100644
--- a/.github/workflows/preview-comment.yml
+++ b/.github/workflows/preview-comment.yml
@@ -20,6 +20,9 @@ permissions:
 jobs:
   publish-preview-comment:
     runs-on: ubuntu-latest
+    concurrency:
+      group: publish-preview-comment-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     steps:
       - name: Gather preview links
         id: gather

From 179acf162a5d27092ecd8523e14f6527cbbd067b Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 16:56:50 -0700
Subject: [PATCH 5/9] Fix cancellation of lint job

---
 .github/workflows/ci-lint.yaml | 40 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci-lint.yaml b/.github/workflows/ci-lint.yaml
index c8bd2783c40..25470773e93 100644
--- a/.github/workflows/ci-lint.yaml
+++ b/.github/workflows/ci-lint.yaml
@@ -23,84 +23,84 @@ jobs:
       - uses: ./.github/actions/init
 
       - name: Lint Boxel Icons
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/boxel-icons
       - name: Build Boxel Icons
         # To faciliate linting of projects that depend on Boxel Icons
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run build
         working-directory: packages/boxel-icons
       - name: Lint Boxel UI
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/boxel-ui/addon
       - name: Build Boxel UI
         # To faciliate linting of projects that depend on Boxel UI
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run build
         working-directory: packages/boxel-ui/addon
       - name: Lint Boxel UI Test App
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/boxel-ui/test-app
       - name: Lint Host
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/host
       - name: Lint Matrix
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/matrix
       - name: Lint Realm Server
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/realm-server
       - name: Lint Runtime Common
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/runtime-common
       - name: Lint Billing
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/billing
       - name: Lint Postgres
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/postgres
       - name: Lint Base Realm
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/base
       - name: Lint Catalog Realm
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/catalog-realm
       - name: Lint Experiments Realm
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/experiments-realm
       - name: Lint Software Factory
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/software-factory
       - name: Lint Boxel Tools VS Code extension
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/vscode-boxel-tools
       - name: Lint ESLint Plugin
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/eslint-plugin-boxel
       - name: Lint AI Bot
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/ai-bot
       - name: Lint Bot Runner
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/bot-runner
       - name: Lint Workspace Sync CLI
-        if: always()
+        if: ${{ !cancelled() }}
         run: pnpm run lint
         working-directory: packages/workspace-sync-cli

From 3722733140e2b5bbe20dbedcabba7eaef8c77599 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 16:57:01 -0700
Subject: [PATCH 6/9] Add cancellations for preview jobs

---
 .github/workflows/pr-boxel-ui.yml  | 7 ++++++-
 .github/workflows/preview-host.yml | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-boxel-ui.yml b/.github/workflows/pr-boxel-ui.yml
index 66189e90b60..d6be7303258 100644
--- a/.github/workflows/pr-boxel-ui.yml
+++ b/.github/workflows/pr-boxel-ui.yml
@@ -21,6 +21,9 @@ jobs:
   check-if-requires-preview:
     name: Check if a preview deploy is required
     runs-on: ubuntu-latest
+    concurrency:
+      group: check-if-requires-ui-preview-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     outputs:
       boxel-ui-files-changed: ${{ steps.boxel-ui-files-that-changed.outputs.any_changed }}
     steps:
@@ -40,7 +43,9 @@ jobs:
     # github.head_ref: the branch that the pull request is from. only appears on pull_request events
     if: github.event.pull_request.head.repo.full_name == github.repository && github.head_ref && needs.check-if-requires-preview.outputs.boxel-ui-files-changed == 'true'
     needs: check-if-requires-preview
-    concurrency: deploy-ui-preview-staging-${{ github.head_ref || github.run_id }}
+    concurrency:
+      group: deploy-ui-preview-staging-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
       - name: Configure AWS credentials
diff --git a/.github/workflows/preview-host.yml b/.github/workflows/preview-host.yml
index b7b969aa44d..af44a55f4ad 100644
--- a/.github/workflows/preview-host.yml
+++ b/.github/workflows/preview-host.yml
@@ -50,7 +50,9 @@ jobs:
     # github.head_ref: the branch that the pull request is from. only appears on pull_request events
     if: github.event.pull_request.head.repo.full_name == github.repository && github.head_ref && needs.check-if-requires-preview.outputs.boxel-host-files-changed == 'true'
     needs: check-if-requires-preview
-    concurrency: deploy-host-preview-staging-${{ github.head_ref || github.run_id }}
+    concurrency:
+      group: deploy-host-preview-staging-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
       - name: Configure AWS credentials
@@ -79,7 +81,9 @@ jobs:
     # github.head_ref: the branch that the pull request is from. only appears on pull_request events
     if: github.event.pull_request.head.repo.full_name == github.repository && github.head_ref && needs.check-if-requires-preview.outputs.boxel-host-files-changed == 'true'
     needs: check-if-requires-preview
-    concurrency: deploy-host-preview-production-${{ github.head_ref || github.run_id }}
+    concurrency:
+      group: deploy-host-preview-production-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
       - name: Configure AWS credentials

From ab696b8ad9818754ed9537656933131560c17b8c Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 17:14:32 -0700
Subject: [PATCH 7/9] Add cancellation for Matrix report

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1662a4ae21a..0c98e166618 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -391,9 +391,12 @@ jobs:
     needs:
       - change-check
       - matrix-client-test
-    # always() makes it run even if a matrix-client-test shard fails
-    if: always() && (needs.change-check.outputs.matrix == 'true' || github.ref == 'refs/heads/main' || needs.change-check.outputs.run_all == 'true')
+    # !cancelled() makes it run even if a matrix-client-test shard fails, but still respects cancellation
+    if: ${{ !cancelled() && (needs.change-check.outputs.matrix == 'true' || github.ref == 'refs/heads/main' || needs.change-check.outputs.run_all == 'true') }}
     runs-on: ubuntu-latest
+    concurrency:
+      group: matrix-client-merge-reports-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
 
     permissions:
       id-token: write

From 96c92cf05a6d991db557c6ecf1f3d81670dc1f33 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 17:15:40 -0700
Subject: [PATCH 8/9] Fix conditionals to respect cancellation

---
 .github/workflows/ci-host.yaml      | 30 +++++++++++++--------------
 .github/workflows/ci.yaml           | 32 ++++++++++++++---------------
 .github/workflows/manual-deploy.yml |  2 +-
 .github/workflows/pr-boxel-ui.yml   |  2 +-
 .github/workflows/preview-host.yml  |  2 +-
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci-host.yaml b/.github/workflows/ci-host.yaml
index 19b4087ec3a..ca42e5fcbd5 100644
--- a/.github/workflows/ci-host.yaml
+++ b/.github/workflows/ci-host.yaml
@@ -118,16 +118,16 @@ jobs:
 
       - name: Upload junit report to GitHub Actions Artifacts
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: host-test-report-${{ matrix.shardIndex }}
           path: junit/host-${{ matrix.shardIndex }}.xml
           retention-days: 30
       - name: Print realm server logs
-        if: always()
+        if: ${{ !cancelled() }}
         run: cat /tmp/server.log
       - name: Extract worker and prerender logs
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           grep -E '^\[start:worker-development' /tmp/server.log > /tmp/worker-manager.log || true
           grep -E '^\[start:prerender-dev' /tmp/server.log > /tmp/prerender-server.log || true
@@ -136,56 +136,56 @@ jobs:
           grep -E '^\[start:test-realms|^\[start:worker-test' /tmp/server.log > /tmp/test-realms.log || true
       - name: Upload realm server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-log-${{ matrix.shardIndex }}
           path: /tmp/server.log
           retention-days: 30
       - name: Upload worker manager log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: worker-manager-log-${{ matrix.shardIndex }}
           path: /tmp/worker-manager.log
           retention-days: 30
       - name: Upload prerender server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: prerender-server-log-${{ matrix.shardIndex }}
           path: /tmp/prerender-server.log
           retention-days: 30
       - name: Upload prerender manager log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: prerender-manager-log-${{ matrix.shardIndex }}
           path: /tmp/prerender-manager.log
           retention-days: 30
       - name: Upload start:development log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: start-development-log-${{ matrix.shardIndex }}
           path: /tmp/start-development.log
           retention-days: 30
       - name: Upload test-realms log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: test-realms-log-${{ matrix.shardIndex }}
           path: /tmp/test-realms.log
           retention-days: 30
       - name: Upload testem log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: testem-log-${{ matrix.shardIndex }}
           path: junit/host-testem.log
           retention-days: 30
       - name: Upload icon server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: icon-server-log-${{ matrix.shardIndex }}
           path: /tmp/icon-server.log
@@ -193,7 +193,7 @@ jobs:
 
   host-percy-finalize:
     name: Finalise Percy
-    if: always()
+    if: ${{ !cancelled() }}
     concurrency:
       group: host-percy-finalize-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
@@ -213,7 +213,7 @@ jobs:
 
   host-merge-reports-and-publish:
     name: Merge Host reports and publish
-    if: always()
+    if: ${{ !cancelled() }}
     concurrency:
       group: host-merge-reports-and-publish-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
@@ -243,7 +243,7 @@ jobs:
 
       - name: Upload merged report
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: host-test-report-merged
           path: host.xml
@@ -251,7 +251,7 @@ jobs:
 
       - name: Publish test results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # 2.18.0
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           junit_files: host.xml
           check_name: Host Test Results
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0c98e166618..4427f27332d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -332,38 +332,38 @@ jobs:
         run: pnpm test:group ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
         working-directory: packages/matrix
       - name: Print realm server logs
-        if: always()
+        if: ${{ !cancelled() }}
         run: cat /tmp/server.log
       - name: Extract worker and prerender logs
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           grep -E '^\[start:worker-base|^\[start:worker-development|^\[start:worker-test' /tmp/server.log > /tmp/worker-manager.log || true
           grep -E '^\[start:prerender-dev' /tmp/server.log > /tmp/prerender-server.log || true
           grep -E '^\[start:prerender-manager-dev' /tmp/server.log > /tmp/prerender-manager.log || true
       - name: Upload realm server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: matrix-test-realm-server-log-${{ matrix.shardIndex }}
           path: /tmp/server.log
           retention-days: 30
       - name: Upload worker manager log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: matrix-test-worker-manager-log-${{ matrix.shardIndex }}
           path: /tmp/worker-manager.log
           retention-days: 30
       - name: Upload prerender server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: matrix-test-prerender-server-log-${{ matrix.shardIndex }}
           path: /tmp/prerender-server.log
           retention-days: 30
       - name: Upload prerender manager log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: matrix-test-prerender-manager-log-${{ matrix.shardIndex }}
           path: /tmp/prerender-manager.log
@@ -590,16 +590,16 @@ jobs:
         env:
           TEST_MODULE: ${{matrix.testModule}}
       - name: Print realm server logs
-        if: always()
+        if: ${{ !cancelled() }}
         run: cat /tmp/server.log
       - name: Prepare artifact name
         id: artifact_name
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           export SAFE_ARTIFACT_NAME=$(echo ${{ matrix.testModule }} |  sed 's/[/]/_/g')
           echo "artifact_name=$SAFE_ARTIFACT_NAME" >> "$GITHUB_OUTPUT"
       - name: Extract worker and prerender logs
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           grep -E '^\[start:worker-development|^\[start:worker-test' /tmp/server.log > /tmp/worker-manager.log || true
           grep -E '^\[start:prerender-dev' /tmp/server.log > /tmp/prerender-server.log || true
@@ -608,42 +608,42 @@ jobs:
           grep -E '^\[start:test-realms|^\[start:worker-test' /tmp/server.log > /tmp/test-realms.log || true
       - name: Upload realm server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-test-realm-server-log-${{steps.artifact_name.outputs.artifact_name}}
           path: /tmp/server.log
           retention-days: 30
       - name: Upload worker manager log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-test-worker-manager-log-${{steps.artifact_name.outputs.artifact_name}}
           path: /tmp/worker-manager.log
           retention-days: 30
       - name: Upload prerender server log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-test-prerender-server-log-${{steps.artifact_name.outputs.artifact_name}}
           path: /tmp/prerender-server.log
           retention-days: 30
       - name: Upload prerender manager log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-test-prerender-manager-log-${{steps.artifact_name.outputs.artifact_name}}
           path: /tmp/prerender-manager.log
           retention-days: 30
       - name: Upload start:development log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-test-start-development-log-${{steps.artifact_name.outputs.artifact_name}}
           path: /tmp/start-development.log
           retention-days: 30
       - name: Upload test-realms log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: realm-server-test-test-realms-log-${{steps.artifact_name.outputs.artifact_name}}
           path: /tmp/test-realms.log
@@ -792,7 +792,7 @@ jobs:
         working-directory: packages/workspace-sync-cli
       - name: Upload test services log
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
-        if: always()
+        if: ${{ !cancelled() }}
         with:
           name: workspace-sync-cli-test-services-log
           path: /tmp/test-services.log
diff --git a/.github/workflows/manual-deploy.yml b/.github/workflows/manual-deploy.yml
index c8b6bfcb8ce..4a1af108576 100644
--- a/.github/workflows/manual-deploy.yml
+++ b/.github/workflows/manual-deploy.yml
@@ -339,7 +339,7 @@ jobs:
         deploy-realm-server,
         post-deploy-realm-server,
       ]
-    if: github.event_name == 'workflow_dispatch' && always()
+    if: ${{ github.event_name == 'workflow_dispatch' && !cancelled() }}
     runs-on: ubuntu-latest
     steps:
       - name: Set deployment status
diff --git a/.github/workflows/pr-boxel-ui.yml b/.github/workflows/pr-boxel-ui.yml
index d6be7303258..6573f8eecbf 100644
--- a/.github/workflows/pr-boxel-ui.yml
+++ b/.github/workflows/pr-boxel-ui.yml
@@ -69,7 +69,7 @@ jobs:
     name: Update preview comment
     needs:
       - deploy-ui-preview-staging
-    if: ${{ always() && needs.deploy-ui-preview-staging.result == 'success' }}
+    if: ${{ !cancelled() && needs.deploy-ui-preview-staging.result == 'success' }}
     uses: ./.github/workflows/preview-comment.yml
     with:
       pr-number: ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/preview-host.yml b/.github/workflows/preview-host.yml
index af44a55f4ad..7cd73374636 100644
--- a/.github/workflows/preview-host.yml
+++ b/.github/workflows/preview-host.yml
@@ -110,7 +110,7 @@ jobs:
     needs:
       - deploy-host-preview-staging
       - deploy-host-preview-production
-    if: ${{ always() && (needs.deploy-host-preview-staging.result == 'success' || needs.deploy-host-preview-production.result == 'success') }}
+    if: ${{ !cancelled() && (needs.deploy-host-preview-staging.result == 'success' || needs.deploy-host-preview-production.result == 'success') }}
     uses: ./.github/workflows/preview-comment.yml
     with:
       pr-number: ${{ github.event.pull_request.number }}

From e29e5e0033615fec5f8664e73116b679f1d0b005 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck.doyle@cardstack.com>
Date: Tue, 17 Mar 2026 20:22:58 -0700
Subject: [PATCH 9/9] Revert change to manual deployment

---
 .github/workflows/manual-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/manual-deploy.yml b/.github/workflows/manual-deploy.yml
index 4a1af108576..c8b6bfcb8ce 100644
--- a/.github/workflows/manual-deploy.yml
+++ b/.github/workflows/manual-deploy.yml
@@ -339,7 +339,7 @@ jobs:
         deploy-realm-server,
         post-deploy-realm-server,
       ]
-    if: ${{ github.event_name == 'workflow_dispatch' && !cancelled() }}
+    if: github.event_name == 'workflow_dispatch' && always()
     runs-on: ubuntu-latest
     steps:
       - name: Set deployment status