Skip to content

ci: Fix incorrect cancellation and host reporting #4385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
backspace merged 3 commits into from
Apr 13, 2026
+11 −2
Merged

ci: Fix incorrect cancellation and host reporting #4385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37da3b8
Fix erroring host report on cancellation
backspace Apr 10, 2026
5506e31
Add concurrency parameter for test-web-assets
backspace Apr 10, 2026
ad726ad
Fix conditional for summary job
backspace Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci-host.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -317,7 +318,7 @@ jobs:

host-merge-reports-and-publish:
name: Merge Host reports and publish
if: ${{ !cancelled() }}
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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-software-factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-web-assets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
Loading