chore(repo): adopt dev/main two-trunk branching model - #23
Merged
Conversation
Establish `dev` as the integration/staging trunk and `main` as production. - CI: run tests on push/PR to `dev` as well as `main`, so the `test` job can gate merges into the staging trunk (previously `main`-only, which under the new flow left `dev` entirely ungated). - CLAUDE.md: document the branch-from-dev / squash-into-dev / merge-into-main flow, the protection rules, and the hotfix path. - /release: promote `dev` -> `main` via a merge-commit PR before tagging, and always pass `--target main` explicitly now that `dev` is the default branch. Paired with repo-side config: default branch `dev`, squash+merge only, auto-delete merged branches, and active rulesets on both `dev` and `main` (PR required, `test` required, no force-push, no deletion). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
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.
Summary
Establishes the two-trunk flow: feature branches off
dev,devas staging,dev→mainas the production promotion.Changes in this PR
.github/workflows/test.yml— run tests on push/PR todevas well asmain. Previouslymain-only, which under the new flow would have left the staging trunk completely ungated.CLAUDE.md— new Branching & Release section documenting the flow, protection rules, and hotfix path..claude/commands/release.md—/releasenow promotesdev→mainvia a merge-commit PR before tagging, and passes--target mainexplicitly (required now thatdevis the default branch).Repo-side config (already applied)
devdev-staging: PR required,testmust pass, squash-only, no force-push, no deletionmain-production: PR required,testmust pass, merge-commit-only, no force-push, no deletionThis PR is itself the first run through the new flow.