fix: cut releases from the release branch instead of blocking on PR merge#25
Merged
Merged
Conversation
…erge The release flow opened a PR into the base branch and then blocked polling for its own merge. But the base branch requires human review that auto-merge can't bypass, so the wait always timed out and no release ever completed. Cut the release from the long-lived release branch instead: - version-bump checks out release, merges the base branch in, then bumps - release-pr pushes release, tags vX.Y.Z on it, and opens a non-blocking sync PR back to base (auto-merge once it's reviewed) - release-pipeline publishes from that tag by reusing publish.yml - release-notes honors the checked-out ref (dropped the hardcoded checkout main) and creates the GitHub release at the v-prefixed tag - stale-cleanup exempts the release branch so it isn't deleted between releases
There was a problem hiding this comment.
Pull request overview
Updates the release automation so releases are cut from a long-lived release branch (and published from a vX.Y.Z tag) rather than blocking on a release PR merging into the protected base branch.
Changes:
- Adjusts the version bump flow to merge
BASE_BRANCHintoreleasebefore bumping and then pushesrelease, tagsvX.Y.Z, and opens a non-blocking sync PR back into base. - Updates release notes creation to use the currently checked-out ref and to create GitHub releases at
v-prefixed tags. - Refactors the release pipeline to publish via the reusable
publish.ymlworkflow using the createdvX.Y.Ztag, and exemptsreleasefrom stale-branch cleanup.
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
src/release-pr.ts |
Switches release PR creation to a release -> base sync PR and tags/pushes vX.Y.Z from release (no merge-wait polling). |
actions/version-bump/action.yml |
Checks out/creates the release branch, merges base into it, then bumps version and runs the updated release PR/tagging step. |
actions/release-notes/action.yml |
Removes hardcoded main checkout behavior and creates GitHub releases at vX.Y.Z tags. |
.github/workflows/stale-cleanup.yml |
Prevents the long-lived release branch from being deleted by stale cleanup. |
.github/workflows/release-pipeline.yml |
Publishes from the vX.Y.Z tag via reusable publish.yml instead of publishing from the workflow’s triggering SHA. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
adrmachado-public
approved these changes
Jul 10, 2026
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.
Summary
The release pipeline opened a PR into the base branch and then blocked polling for its own merge. But the base branch requires human review that auto-merge can't bypass, so the wait always timed out and no release ever completed. This cuts the release from the long-lived
releasebranch instead, so deploy no longer waits on the base-branch review gate.Changes
version-bump: check outrelease, merge the base branch in, then bump version + CHANGELOGrelease-pr: pushrelease, tagvX.Y.Zon it, open a non-blockingrelease -> basesync PR (auto-merge once reviewed). Dropped the merge-wait poll and the post-merge tail.release-pipeline: publish from that tag by reusingpublish.ymlrelease-notes: honor the checked-out ref (removed the hardcodedgit checkout main); create the GitHub release at thev-prefixed tagstale-cleanup: exempt thereleasebranch so it isn't deleted between releasesFollow-up (not in this PR)
Bump the internal action refs (currently
@cf4b40f...) to this commit's SHA sorelease-pipeline->publish.yml->release-notesall resolve to the fixed code, then re-pin the consumer repos.