From 94b2b73a7a4502a7cae538fd91af012a07c388a0 Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Fri, 18 Sep 2026 10:29:07 +0200 Subject: [PATCH 1/2] doc: maintenance branch rules Document how maintenance branches are created and what they may receive: only backports and branch specific fixes, never a fast-forward to master. The latter happened to 31.x, which as a result picked up submitBlock() (not part of Bitcoin Core 31.x) and lost its CI configuration, see #35. --- RELEASE_POLICY.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/RELEASE_POLICY.md b/RELEASE_POLICY.md index ce50630..aa183ea 100644 --- a/RELEASE_POLICY.md +++ b/RELEASE_POLICY.md @@ -13,10 +13,23 @@ This policy applies to: ## Branch Model -- `master` tracks the current active development line. -- Maintenance branches (for example `30.x`, `31.x`) track stable backport lines. +- `master` tracks the current active development line, i.e. Bitcoin Core `master`. +- Maintenance branches (for example `30.x`, `31.x`) track stable backport lines, i.e. the Bitcoin Core branch of the same name. - A release must be cut from the branch that owns that version line. +### Maintenance Branches + +- A maintenance branch is created from `master` after Bitcoin Core branches off, at a point where the schema files match the new Bitcoin Core branch. +- Its CI builds the Bitcoin Core branch of the same name, and runs for pushes and pull requests that target the maintenance branch. +- After creation it only receives backports from `master` and fixes specific to that branch. It must never be fast-forwarded to, or merged with, `master`. +- The schema files must keep matching the corresponding Bitcoin Core branch. Interface changes are only backported if Bitcoin Core backported them. Test and build changes can be backported more freely. +- Backported commits reference the original pull request and commit on `master`, using the Bitcoin Core convention: + + ``` + Github-Pull: # + Rebased-From: + ``` + ## Version Line Mapping - `30.x` branch -> `0.1.x` From b32b3adaa1ac90c3e76f819be34b6e28a2f960dc Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Fri, 18 Sep 2026 10:29:07 +0200 Subject: [PATCH 2/2] doc: map 32.x branch to 0.3.x crate line --- RELEASE_POLICY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_POLICY.md b/RELEASE_POLICY.md index aa183ea..3ad2dd2 100644 --- a/RELEASE_POLICY.md +++ b/RELEASE_POLICY.md @@ -34,6 +34,7 @@ This policy applies to: - `30.x` branch -> `0.1.x` - `31.x` branch -> `0.2.x` +- `32.x` branch -> `0.3.x` - Future Bitcoin Core branch lines should get a new crate minor line (`0.N.x`). ## Required Invariants