chore(ci): flatten gitflow to develop → master#20
Merged
Conversation
Drop the develop → main/<version> → stable stabilization layer (solo
maintainer; the ceremony isn't earning its keep). New release train is
develop → master, with master as the single release branch.
Changes:
- branch-policy.yml: allow only develop/hotfix → master (was stable ←
main/hotfix). Triggers on PRs to master.
- bump-version-on-pr-to-{stable→master}.yml: trigger on PR to master,
gate on head_ref == 'develop'. Compares develop vs master; auto-bumps
patch only if develop isn't already ahead (manual minor/major bumps
set on develop pass through).
- release-on-merge-to-{stable→master}.yml: trigger on merge to master,
checkout master, tag vX.Y.Z + GitHub Release targeting master.
- pr-lint-and-test.yml: trigger on [develop, master] (was
[develop, stable, main, main/**]).
- docs/branching-strategy.md: rewrite for the two-branch model.
- pyproject.toml: 0.1.3 → 0.2.0 (next release is a minor bump).
Follow-up (not in this PR): rename the stable branch → master via
`gh api .../branches/stable/rename`. The existing ruleset is keyed on
~DEFAULT_BRANCH so it auto-covers master without reconfiguration.
Orphaned asset: docs/assets/gitflow-vertical-branching.svg still depicts
the old 5-branch model and is no longer referenced — safe to delete later.
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.
Why
Solo-maintainer repo. The
develop → main/<version> → stablestabilization layer adds ceremony without value. Collapse to a single release branch:develop → master.What changes
branch-policy.ymldevelop/hotfix/*→master(wasstable ← main/hotfix)bump-version-on-pr-to-master.yml(renamed from-to-stable)master, gatehead_ref == 'develop'; auto-bumps patch only if develop isn't already aheadrelease-on-merge-to-master.yml(renamed from-to-stable)master; checkout master, tagvX.Y.Z+ GitHub Releasepr-lint-and-test.yml[develop, master](was[develop, stable, main, main/**])docs/branching-strategy.mdpyproject.toml0.1.3→0.2.0(next release ships as a minor bump)How the release works now
developviafeature/*PRs.develop → master. Ifdevelop's version isn't ahead, CI bumps the patch component; otherwise (like this0.2.0) it passes through.release-on-merge-to-mastertagsvX.Y.Zand creates the GitHub Release.Hotfixes branch from
master, bump manually, and merge back to bothmasteranddevelop.Follow-ups (out of scope for this PR)
stable→masterviagh api repos/.../branches/stable/rename. The repo ruleset (~DEFAULT_BRANCH) auto-coversmaster, so no protection reconfig needed. PR release: promote develop → stable (timeline compression, reasoning replay, LLM provider injection) #18 (develop→stable) will auto-retarget to develop→master. I'll do this after this PR merges — flagged for explicit confirmation since the rename is irreversible.docs/assets/gitflow-vertical-branching.svg— orphaned diagram of the old 5-branch model, no longer referenced.Notes
stableruleset (id 14179917) is keyed on~DEFAULT_BRANCH, so it automatically protectsmasterpost-rename. Its label says "stable branch protection" but is name-agnostic; rename-for-clarity is cosmetic.develop.Verification
check yaml✅).