Skip to content

chore: use merge commits for promotions; drop linear-history on main #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jeston10 merged 1 commit into from
Sep 15, 2026
Merged

chore: use merge commits for promotions; drop linear-history on main #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PROCESS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ milestone/p<N>-<name> one per phase in docs/MILESTONES.md; creat
│ PR when the phase exit criteria are met (CI green on the milestone branch)
▼
dev integration; deployed to the preview environment; soak-tested
│ PR only from dev (promotion guard) with CI green; squash or merge commit, tagged
│ PR only from dev (promotion guard) with CI green; merge commit, tagged
▼
main production; protected; never receives direct pushes
```

Rules:
- `main` and `dev` are protected: PRs only, required checks (`CI` jobs + `Promotion guard`), no force-push, linear history on `main`.
- `main` and `dev` are protected: PRs only, required checks (`CI` jobs + `Promotion guard`), no force-push, no deletions. Promotions are **merge commits** (not squash/rebase) so `dev` and `main` share history and each phase stays traceable.
- Milestone branches are `milestone/p0-toolchain`, `milestone/p1-security`, … (names in `docs/MILESTONES.md`). They are deleted after their PR into `dev` merges; the next milestone branch is cut from the updated `dev`.
- Work branches are cut from the current milestone branch and merged back into it by PR. They never target `dev` or `main`.
- `hotfix/*` may target `dev` directly (and is then promoted to `main` through `dev`); it is the only exception.
Expand Down
4 changes: 2 additions & 2 deletions scripts/github/protect-branches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ REPO="${1:-$(gh repo view --json nameWithOwner -q .nameWithOwner)}"
CHECKS='"Lint · Typecheck · Secrets","Unit · Integration","Build · Audit · Size","Check source branch"'

protect() {
branch="$1"; linear="$2"
branch="$1"; linear="$2" # linear history stays off: promotions are merge commits (PROCESS.md)
echo "Protecting $REPO:$branch"
gh api -X PUT "repos/$REPO/branches/$branch/protection" \
-H "Accept: application/vnd.github+json" \
Expand All @@ -31,6 +31,6 @@ protect() {
JSON
}

protect main true
protect main false
protect dev false
echo "Done. Verify under Settings → Branches."
Loading