docs(branching): adopt trunk-on-main default - #552
Merged
Merged
Conversation
8 tasks
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.
Closes #551
Summary
mainis the organization default andziis the sole named persistent-integration exceptionzi, with no routine back-merge or branch rewritezilinear-history override and make class-3 CI required when CI existspromote-prepare.ymldraft, which was superseded before any caller adopted itDecision
wiki,src,zsh-lint, andzsh-ezamigrate to trunk-on-main.zikeepsnextas its integration branch and promotes it to stablemainonly with a merge commit. A persistent integration branch in any future repository requires an explicit ADR amendment.Instruction impact review
decisions/0019-trunk-on-main-default.mdis the canonical branch-model owner.AGENTS.md, scoped instructions, runbooks, templates, and audit data derive from it.nextbranch-enforcement contradictions are removed..github/instruction-surfaces.jsonadds ADR 0019 for architecture, branch protection, repository bootstrap, and release tasks. No adapter route changes are needed.AGENTS.mdand the required manifest surface. No optional hook, skill, or plugin owns the rule.git diff --checkpass. The private composite will be regenerated and validated as a separate gitlink-aware workspace step after this public change lands.Validation
python3 scripts/validate-agent-policy.pypython3 -m unittest scripts/test_validate_agent_policy.py -vruby -c scripts/repo-settings-audit.rbruby -c scripts/test-repo-settings-audit.rbruby scripts/test-repo-settings-audit.rbactionlint .github/workflows/*.ymlscripts/trunk-safe-check.sh -- check --no-fixgit diff --checkFollow-through
The parent issue #550 tracks coordinated
src,wiki,zsh-lint,zsh-eza,zi, live ruleset, branch-retirement, deployment-environment, wiki documentation, and private composite completion. This PR establishes the canonical policy required before those repository changes are applied.