Repository navigation
feat(release): add the main + stableX.Y branch model and a backport workflow - #921
Merged
Merged
Conversation
…orkflow Adds an opt-in `branch-model: main` (ADR-122) to release.yml and branch-protection.yml, a reusable backport.yml, and a `main-branch` list in fleet-apps.json that the back-merge, Friday merge and CVE release workflows leave out. - release.yml: under `branch-model: main` the version comes from the branch's info.xml. A push to main is an unstable X.Y.0-dev.<ts> GitHub prerelease without a bump commit. beta X.Y.Z-beta.N comes from main or stableX.Y, rc and stable from stableX.Y only, and a stable release ships the version committed in info.xml. The sync back into development is skipped. Default behaviour is unchanged except for two fleet-wide fixes: betas upload with nightly false, and a new step fails the release when the tag, the tagged info.xml and the packaged info.xml disagree. - branch-protection.yml: under `branch-model: main`, any branch may target main, stableX.Y accepts backport/*, release/v*, hotfix/* and dependabot/*, and development and beta take no pull requests. - backport.yml: `/backport to stableX.Y`, `/backport! to stableX.Y` or a `backport stableX.Y` label cherry-picks the merged PR onto backport/<pr>/<target> and opens a PR, as a draft when it conflicts. Assisted-by: ClaudeCode:claude-opus-5-5
…port label Assisted-by: ClaudeCode:claude-opus-5-5
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.
Opt-in support for developing on
mainwithstableX.Yversion branches (ADR-122, hydra draft). The openregister pilot is the first caller. Every other app keeps today's behaviour until its callers passbranch-model: main.Changes
branch-model(defaultdevelopment). Undermain:appinfo/info.xml;X.Y.0-dev.<ts>GitHub prerelease, with no bump commit and no App Store upload;beta(X.Y.Z-beta.N) comes from main orstableX.Y.rcandstablecome fromstableX.Yonly;stableships exactly the version committed in info.xml and refuses when that has a suffix or is already tagged;developmentis skipped.nightly: false. The store classes them as prereleases by suffix, and its docs say prereleases published as nightly break updates;info.xmland the packagedinfo.xmldisagree. Unstable undermainis exempt, because it is a GitHub prerelease only.branch-model. Undermain, any branch may targetmain,stableX.Yacceptsbackport/*,release/v*,hotfix/*anddependabot/*, anddevelopment/betaare refused./backport to stableX.Y(runs on merge),/backport! to stableX.Y(runs now) or abackport stableX.Ylabel;-xontobackport/<pr>/<target>and opens a PR. On a conflict it opens a draft with the conflicting files and the commands to finish by hand;main-branchlist (openregister).fleet-back-merge,fleet-friday-mergeandfleet-cve-releaseleave those apps out.Merge timing
Callers resolve
@main, so merging changes production straight away:main-branchentry stops back-merges for openregister.So merge this at the openregister cutover, not before.
Verified locally
stable2.1, a suffix on stable (refused), the wrong line, and an existing tag.ghagainst a local bare repo: a clean squash pick, a missing target and a conflict (draft).${{ }}template expressions.This PR was prepared with AI assistance (Claude Code) and needs human review before merge.