Skip to content

fix(ci): merge smoke-test release phase 2 into repository dispatch#420

Merged
c-vigo merged 2 commits intorelease/0.3.1from
bugfix/419-smoke-test-release-phase-2-failed
Mar 23, 2026
Merged

fix(ci): merge smoke-test release phase 2 into repository dispatch#420
c-vigo merged 2 commits intorelease/0.3.1from
bugfix/419-smoke-test-release-phase-2-failed

Conversation

@c-vigo
Copy link
Contributor

@c-vigo c-vigo commented Mar 23, 2026

Description

Merges smoke-test release phase 2 back into repository-dispatch.yml so downstream release.yml runs while release/<version> still exists (fixing the branch-not-found failure). Removes the separate on-release-pr-merge.yml workflow. Updates Bats coverage for the smoke-test template layout.

Type of Change

  • feat -- New feature
  • fix -- Bug fix
  • docs -- Documentation only
  • chore -- Maintenance task (deps, config, etc.)
  • refactor -- Code restructuring (no behavior change)
  • test -- Adding or updating tests
  • ci -- CI/CD pipeline changes
  • build -- Build system or dependency changes
  • revert -- Reverts a previous commit
  • style -- Code style (formatting, whitespace)

Modifiers

  • Breaking change (!) -- This change breaks backward compatibility

Changes Made

  • assets/smoke-test/.github/workflows/repository-dispatch.yml — absorb phase 2: run release.yml while release branch exists, then enable auto-merge and poll for merge completion
  • assets/smoke-test/.github/workflows/on-release-pr-merge.yml — removed (logic merged into dispatch workflow)
  • CHANGELOG.md and assets/workspace/.devcontainer/CHANGELOG.md — document fix under 0.3.1 Fixed
  • tests/bats/just.bats — align expectations with updated smoke-test workflow files

Changelog Entry

This branch targets release/0.3.1 (no ## Unreleased section). Added under ## [0.3.1] - TBD → ### Fixed:

  • Smoke-test release phase 2 branch-not-found failure (#419)
    • Merge phase 2 (on-release-pr-merge.yml) back into repository-dispatch.yml so the release runs while release/<version> still exists, matching the normal release flow
    • Remove on-release-pr-merge.yml from the smoke-test template

Testing

  • Tests pass locally (just test)
  • Manual testing performed (describe below)

Manual Testing Details

just test-bats completed successfully (smoke-test / install-related Bats suites).

Checklist

  • My code follows the project's style guidelines
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have updated the documentation accordingly (edit docs/templates/, then run just docs)
  • I have updated CHANGELOG.md in the [Unreleased] section (and pasted the entry above)
  • My changes generate no new warnings or errors
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published

Additional Notes

Changelog entry was added under ## [0.3.1] - TBD (release branch convention; no ## Unreleased on this target).

Refs: #419

Run release.yml while release/<version> still exists, then enable auto-merge and poll for merge. Remove on-release-pr-merge.yml.

Refs: #419
@c-vigo c-vigo self-assigned this Mar 23, 2026
@c-vigo c-vigo requested a review from Copilot March 23, 2026 18:30
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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-release and merge-release-pr jobs to the smoke-test repository-dispatch.yml to run release.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 in repository-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.

@c-vigo c-vigo merged commit 8f8b60f into release/0.3.1 Mar 23, 2026
12 checks passed
@c-vigo c-vigo deleted the bugfix/419-smoke-test-release-phase-2-failed branch March 23, 2026 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants