Skip to content

docs(agents): release-branch model + branch-protection policy for release/vN - #278

Merged
ChrisonSimtian merged 1 commit into
mainfrom
docs/release-branch-protection-policy
May 29, 2026
Merged

docs(agents): release-branch model + branch-protection policy for release/vN#278
ChrisonSimtian merged 1 commit into
mainfrom
docs/release-branch-protection-policy

Conversation

@ChrisonSimtian

Copy link
Copy Markdown
Collaborator

Closes #270 (the doc half — the actual branch protection on release/v11 was applied via API; this PR captures the policy in docs/agents/release-and-versioning.md so future release/vN cuts mirror it).

What changes

Branching section

New subsection: Branch protection on release/vN

Captures the exact protection profile applied to release/v11 (mirroring main's settings). Lists each rule so any future release/vN (v12, v13...) gets the same treatment at cut time.

Release pipeline section

Updated for accuracy — acknowledges the workflow_dispatch stopgap (#268) and references the pending tag-triggered shape (#274) and NUGET_API_KEY-to-environment migration (#273). One outdated claim ("triggered on push to main") corrected.

What this PR deliberately does NOT do

Verification

  • Branch-protection profile listed in the doc matches what was applied to release/v11 (gh api repos/.../branches/release/v11/protection output diffs only on URL fields vs main's).
  • Markdown links all resolve.
  • CI green.

🤖 Generated with Claude Code

…ease/vN (#270)

Updates docs/agents/release-and-versioning.md to reflect the new branching
model now that release/v11 has been cut (#269) and the auto-publish stopgap
landed (#268).

Branching section:
- main is now the integration trunk (PRs target here), no longer auto-publishes
- release/vN is the release channel per major (release/v11 exists; release/v12
  will follow when v12 ships)
- Hotfix flow noted as "cherry-pick from main"
- Stale "No release/* branches" line removed

New "Branch protection on release/vN" subsection captures the policy that
gets applied to every release/vN at cut time:
- Required ubuntu-latest status check
- Linear history
- CODEOWNER review required
- Stale-approval dismissal
- Direct pushes / force-pushes / deletions blocked
- Conversation resolution required
- Admins can bypass in emergencies

Release pipeline section updated to acknowledge the workflow_dispatch
stopgap and reference the pending tag-triggered shape under #274, and the
NUGET_API_KEY move-to-environment-secret under #273.

Closes #270 (the API-level branch protection on release/v11 was already
applied; this PR is the documentation half of the acceptance criteria).

Refs milestone #13, RFC #267.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Branch protection on release/v11 (and future release/vN)

1 participant