fix(ci): merge smoke-test release phase 2 into repository dispatch#420
Merged
c-vigo merged 2 commits intorelease/0.3.1from Mar 23, 2026
Merged
Conversation
Run release.yml while release/<version> still exists, then enable auto-merge and poll for merge. Remove on-release-pr-merge.yml. Refs: #419
There was a problem hiding this comment.
Pull request overview
This PR fixes the smoke-test release “phase 2” branch-not-found failure by moving the downstream release.yml dispatch/wait logic back into the main repository-dispatch.yml orchestration so the release workflow runs before the release/<version> branch is merged/deleted.
Changes:
- Add
trigger-releaseandmerge-release-prjobs to the smoke-testrepository-dispatch.ymlto runrelease.yml, then enable auto-merge and wait for the release PR to merge. - Remove the separate smoke-test workflow
on-release-pr-merge.yml(phase 2) since its logic is now inrepository-dispatch.yml. - Update changelog entries and adjust Bats assertions to reflect the new workflow layout.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
assets/smoke-test/.github/workflows/repository-dispatch.yml |
Merges phase 2 logic into the dispatch workflow: trigger/wait for release.yml, then enable auto-merge and poll for PR merge. |
assets/smoke-test/.github/workflows/on-release-pr-merge.yml |
Removed legacy phase 2 workflow that triggered after release PR merge. |
tests/bats/just.bats |
Updates greps/assertions to validate the new orchestration flow in repository-dispatch.yml. |
CHANGELOG.md |
Documents the phase 2 branch-not-found fix under 0.3.1 Fixed. |
assets/workspace/.devcontainer/CHANGELOG.md |
Mirrors the same changelog entry for the workspace template devcontainer changelog. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Merges smoke-test release phase 2 back into
repository-dispatch.ymlso downstreamrelease.ymlruns whilerelease/<version>still exists (fixing the branch-not-found failure). Removes the separateon-release-pr-merge.ymlworkflow. Updates Bats coverage for the smoke-test template layout.Type of Change
feat-- New featurefix-- Bug fixdocs-- Documentation onlychore-- Maintenance task (deps, config, etc.)refactor-- Code restructuring (no behavior change)test-- Adding or updating testsci-- CI/CD pipeline changesbuild-- Build system or dependency changesrevert-- Reverts a previous commitstyle-- Code style (formatting, whitespace)Modifiers
!) -- This change breaks backward compatibilityChanges Made
assets/smoke-test/.github/workflows/repository-dispatch.yml— absorb phase 2: runrelease.ymlwhile release branch exists, then enable auto-merge and poll for merge completionassets/smoke-test/.github/workflows/on-release-pr-merge.yml— removed (logic merged into dispatch workflow)CHANGELOG.mdandassets/workspace/.devcontainer/CHANGELOG.md— document fix under 0.3.1 Fixedtests/bats/just.bats— align expectations with updated smoke-test workflow filesChangelog Entry
This branch targets
release/0.3.1(no## Unreleasedsection). Added under## [0.3.1] - TBD→ ### Fixed:on-release-pr-merge.yml) back intorepository-dispatch.ymlso the release runs whilerelease/<version>still exists, matching the normal release flowon-release-pr-merge.ymlfrom the smoke-test templateTesting
just test)Manual Testing Details
just test-batscompleted successfully (smoke-test / install-related Bats suites).Checklist
docs/templates/, then runjust docs)CHANGELOG.mdin the[Unreleased]section (and pasted the entry above)Additional Notes
Changelog entry was added under
## [0.3.1] - TBD(release branch convention; no## Unreleasedon this target).Refs: #419