PR-based release back-merge; fast-forward release flow - #19
Merged
Conversation
Release reentrant device context
Release v1.2.0: CRA security package
The old back-merge job direct-pushed a fresh merge commit to develop, which protected-branch rules now reject (GH006 on the v1.2.0 release). Releases fast-forward main to green develop SHAs, so the job is normally a no-op; if main diverged it opens a PR instead of pushing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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
1 participant
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.
Follow-up to the CI-honesty changes in #17:
back-merge-developdirect-pushed a merge commit to the now-protecteddevelopand failed GH006 on the v1.2.0 release. It now checks ancestry (no-op when main ⊆ develop) and opens a PR when a back-merge is genuinely needed.RELEASE_STRATEGY.mddocuments the fast-forward promotion flow (git push origin origin/develop:main) that keeps main an exact subset of develop, and mentions the SBOM release assets.🤖 Generated with Claude Code