ci: add merge-back automation after stable releases#100
Merged
Conversation
After epic promotion (beta -> main), the stable release tag only exists on main's merge commit. Without merging main back into beta, semantic- release on beta cannot see the stable tag and keeps incrementing the old pre-release version (e.g., v1.7.0-beta.22 instead of v1.8.0-beta.1). Adds: - Automated merge-back job in release.yml (Job 4) - Step 15 in CLAUDE.md workflow documentation - Merge-back explanation in Release Model section Co-Authored-By: Claude orchestrator (Opus 4.6) <noreply@anthropic.com>
Contributor
|
🎉 This PR is included in version 1.8.0-beta.2 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
17 tasks
Contributor
|
🎉 This PR is included in version 1.8.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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
2 participants
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
merge-backjob (Job 4) torelease.ymlthat automatically creates a PR frommain→betaafter stable releasesContext: After epic promotion (beta → main → v1.7.0), semantic-release on beta kept producing
v1.7.0-beta.Xinstead ofv1.8.0-beta.1. The root cause: thev1.7.0tag sits on main's merge commit, which is not an ancestor of beta. The merge-back job ensures the stable release tag becomes reachable from beta's history.Companion PR: #99 (already merged) performed the immediate fix by merging main back into beta for v1.7.0.
Test plan
release.ymlmerge-back job only triggers on stable releases (is-prerelease == 'false')🤖 Generated with Claude Code