Repository navigation
ADR 0042
Status: accepted · Built: done · Date: 2026-11-21 · Supersedes: 0009, 0024 · Superseded by: 0051
CI checks branch names, rulesets protect main and the release tags, the website builds from tags. Partly superseded by 0051: there are no kit-v tags or kit release branches any more; the check keeps the name kit and CLI on Node 24 for the ruleset.
The repository had two long-lived branches: dev, the default, where pull requests went, and
main, which held production. Every release took a release branch into main and then a pull
request merging main back into dev, so 0.8.2 needed four merges for one change set. The two
branches drifted apart in history even when their trees were the same, and the push rules,
skills and docs all had to name both.
Releases are already signed version tags, and deploying is already a separate, manual step. The
owner's Sokobanko works with main alone.
This record replaces two rules that assumed main held only released code:
ADR 0009's main → latest image tag, and
ADR 0024's website deployed on every push to main. The rest of
both records stands.
-
mainis the only long-lived branch and the default branch. Work happens on short-lived branches cut fromorigin/main, namedfeature/<name>,bugfix/<name>orchore/<name>(lowercase letters, digits, dots, hyphens), and merges back through a pull request. - Pull requests merge with a merge commit only; squash and rebase are off. Branches are deleted after merging.
- The
branch-namecheck (its own workflow, so it re-runs when a pull request is retargeted) fails a pull request that doesn't targetmainor whose branch doesn't follow the names. Dependabot's owndependabot/…branches are allowed. - A ruleset on
mainallows changes only through pull requests withbranch-name,verify,kit and CLI on Node 24andImagepassing, with no force pushes and no deletion. A second ruleset stopsv*andkit-v*tags from being moved or deleted. - A release is a
chore/release-X.Y.Zpull request (orchore/release-kit-A.B.C), then a signed tag on the merge commit. Nothing is merged back. - Merging to
mainpublishes the image assha-<short>only. Av*tag publishesX.Y.Z,X.Yand the CLI; a stable tag also moveslatest(a pre-release tag doesn't). Av*tag whose version matchespackage.jsonrebuilds the website, so spotcraft.dev shows the released docs. - Deploying Spotcraft stays a manual run of the Deploy workflow with a tag.
- One pull request per change and one per release; no back-merge, no drift between branches.
-
mainholds unreleased work. The image taglatestand the website now follow releases, notmain. - Branch names are checked, so a branch an agent's worktree names on its own (
claude/…) has to be pushed under afeature/,bugfix/orchore/name. - Renaming one of the required CI jobs means updating the
mainruleset in the same change.
Published from docs/. Edit the files there; changes here are overwritten.