diff --git a/.github/workflows/labels-sweep.yml b/.github/workflows/labels-sweep.yml index 557ca81..d021e2b 100644 --- a/.github/workflows/labels-sweep.yml +++ b/.github/workflows/labels-sweep.yml @@ -63,7 +63,7 @@ on: env: # A called workflow arrives without its repository. Keep this literal pin # aligned with the ceremony release consumed by callers (issue #9 D3). - CEREMONY_SELF_REF: "0.6.1" + CEREMONY_SELF_REF: "0.6.2" jobs: reconcile: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index baebe76..a98565c 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -48,7 +48,7 @@ on: env: # A called workflow arrives without its repository. Keep this literal pin # aligned with the ceremony release consumed by callers (issue #9 D3). - CEREMONY_SELF_REF: "0.6.1" + CEREMONY_SELF_REF: "0.6.2" jobs: scope: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e4575f..81fea7a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -129,7 +129,7 @@ env: # `ref:` accepts ${{ env }}; `uses:` strings do not — which is why the # shared logic arrives as script files via checkout, not as inner `uses:` # references. - CEREMONY_SELF_REF: "0.6.1" + CEREMONY_SELF_REF: "0.6.2" VERSION_SOURCE: ${{ inputs.version-source }} jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f8b246..a3cb9cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,10 +17,47 @@ This tree is `heavy-duty/ceremony` on numbers (#197 D2). Two trees therefore answer to the same number, differing by the forge-compatibility delta. **This tree carries upstream through `8c3a4d1`** (upstream `0.6.0`, merged by #198); the `0.4.1` section below is -this forge's own release, not upstream's, and upstream's separate `0.4.1` -section is deliberately not carried — the tag published here is the one this -section is the body of. Each sync updates this line -(docs/UPSTREAM-SYNC.md, #200). +this forge's own release, not upstream's, and upstream `0.6.1` through `0.6.3` +were adopted by port rather than merge. Upstream's separate `0.4.1` section +is deliberately not carried — the tag published here is the one this section +is the body of. Each sync updates this line (docs/UPSTREAM-SYNC.md, #200). + +## 0.6.2 — 2026-08-24 + +### Changed + +- `upstream-0.6.1` was ported in #229: CONTRIBUTING routes the vendored set + through `docs/VENDORED.txt` — upstream#316 and upstream#311; BUILDER.md + scopes the green-check precondition to its act, upstream#330; RELEASES.md + adds the post-merge gate-member split, upstream#329 (#246). + +- `upstream-0.6.2` was ported in #229: BUILDER.md orders parked claims so an + operator-owned remainder parks the claim, never the handoff — upstream#336 + (#246). + +- `upstream-0.6.3` was ported in #230: release windows read `## Members` with + no gate fallback, carriers leave their own gates, stale board flags stay + silent — upstream#343 and upstream#327 — and the parser accepts CommonMark + rows (#246). + +- Upstream logic was ported onto this forge's Forgejo-adapted issue-flow + reconciler, test, and CONTRIBUTING; those files were never overwritten with + upstream bytes (#246). + +- Upstream's drill-record fixes and the upstream `0.7.0`–`0.7.4` line are + deferred to the next sync campaign (#246). + +- No upstream ancestry moves in this release: `.upstream-ref` remains + `8c3a4d1` from upstream `0.6.0`, merged by #198; `upstream-0.6.3` is the + content baseline, not a merge-base (#246). +- Release windows now read membership from a dedicated `## Members` record, with CommonMark-bounded rows and no fallback to predecessor gates (#230). +- Forge consumers now receive the upstream 0.6.1 and 0.6.2 doctrine for vendored-set routing, review-round signalling, operator-owned remainders, producer liveness, and post-merge release edges (#229). +- `docs/RUNNER-PROBES.md` records the delivered 0.6.1 consumer exercise in the standing Forgejo runner venue (#217). + +### Fixed + +- Forgejo drafts and fast-forward conflict-check windows no longer surface as merge conflicts when the API has not distinguished one (#236). +- Forgejo review requests no longer count as verdicts, while its blocking and comment states now grade like their GitHub equivalents (#235). ## 0.6.1 — 2026-08-09 diff --git a/VERSION b/VERSION index 394f84e..b616048 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.2-dev +0.6.2 diff --git a/changelog.d/217.md b/changelog.d/217.md deleted file mode 100644 index ab019aa..0000000 --- a/changelog.d/217.md +++ /dev/null @@ -1,3 +0,0 @@ -### Changed - -- `docs/RUNNER-PROBES.md` records the delivered 0.6.1 consumer exercise in the standing Forgejo runner venue (#217). diff --git a/changelog.d/229.md b/changelog.d/229.md deleted file mode 100644 index cb18bc8..0000000 --- a/changelog.d/229.md +++ /dev/null @@ -1,3 +0,0 @@ -### Changed - -- Forge consumers now receive the upstream 0.6.1 and 0.6.2 doctrine for vendored-set routing, review-round signalling, operator-owned remainders, producer liveness, and post-merge release edges (#229). diff --git a/changelog.d/230.md b/changelog.d/230.md deleted file mode 100644 index 5569ac0..0000000 --- a/changelog.d/230.md +++ /dev/null @@ -1,3 +0,0 @@ -### Changed - -- Release windows now read membership from a dedicated `## Members` record, with CommonMark-bounded rows and no fallback to predecessor gates (#230). diff --git a/changelog.d/235.md b/changelog.d/235.md deleted file mode 100644 index 49f9123..0000000 --- a/changelog.d/235.md +++ /dev/null @@ -1,3 +0,0 @@ -### Fixed - -- Forgejo review requests no longer count as verdicts, while its blocking and comment states now grade like their GitHub equivalents (#235). diff --git a/changelog.d/236.md b/changelog.d/236.md deleted file mode 100644 index 098c379..0000000 --- a/changelog.d/236.md +++ /dev/null @@ -1,3 +0,0 @@ -### Fixed - -- Forgejo drafts and fast-forward conflict-check windows no longer surface as merge conflicts when the API has not distinguished one (#236). diff --git a/changelog.d/246.md b/changelog.d/246.md deleted file mode 100644 index c99e50b..0000000 --- a/changelog.d/246.md +++ /dev/null @@ -1,26 +0,0 @@ -### Changed - -- `upstream-0.6.1` was ported in #229: CONTRIBUTING routes the vendored set - through `docs/VENDORED.txt` — upstream#316 and upstream#311; BUILDER.md - scopes the green-check precondition to its act, upstream#330; RELEASES.md - adds the post-merge gate-member split, upstream#329 (#246). - -- `upstream-0.6.2` was ported in #229: BUILDER.md orders parked claims so an - operator-owned remainder parks the claim, never the handoff — upstream#336 - (#246). - -- `upstream-0.6.3` was ported in #230: release windows read `## Members` with - no gate fallback, carriers leave their own gates, stale board flags stay - silent — upstream#343 and upstream#327 — and the parser accepts CommonMark - rows (#246). - -- Upstream logic was ported onto this forge's Forgejo-adapted issue-flow - reconciler, test, and CONTRIBUTING; those files were never overwritten with - upstream bytes (#246). - -- Upstream's drill-record fixes and the upstream `0.7.0`–`0.7.4` line are - deferred to the next sync campaign (#246). - -- No upstream ancestry moves in this release: `.upstream-ref` remains - `8c3a4d1` from upstream `0.6.0`, merged by #198; `upstream-0.6.3` is the - content baseline, not a merge-base (#246). diff --git a/docs/UPSTREAM-SYNC.md b/docs/UPSTREAM-SYNC.md index 84bbd8b..8f5b40d 100644 --- a/docs/UPSTREAM-SYNC.md +++ b/docs/UPSTREAM-SYNC.md @@ -17,6 +17,24 @@ resolution is standing and does not get re-decided each sync. Worked example throughout: the `0.6.0` sync (#197, #198), which merged upstream `8c3a4d1` onto `dad99dd` and took four heads to get green. +## 0.6.2 port record + +On 2026-08-24 this tree released the content carried by upstream +`upstream-0.6.1` through `upstream-0.6.3`. The content baseline is +`upstream-0.6.3`; the changes were ported onto the Forgejo-adapted tree by +#229 and #230 rather than merged from upstream. + +The ancestry baseline therefore remains the full `.upstream-ref` value +`8c3a4d1dee2bdb5ac06a632a285bb65ab2615214` (upstream `0.6.0`, merged by +#198). No upstream ancestry moved in this release. Tags are disambiguated as +`upstream-0.6.x` for upstream's line and bare `0.6.x` for releases cut on this +forge. + +Upstream's drill-record fixes and the upstream `0.7.0` through `0.7.4` line +remain deferred to the next sync campaign. If that campaign merges rather +than ports, it is the campaign that advances `.upstream-ref`; another port +leaves the ancestry baseline unchanged. + ## The standing resolutions These recur every sync. They are decided; re-deciding them is the cost this diff --git a/drills/0.6.2.md b/drills/0.6.2.md new file mode 100644 index 0000000..9a58e75 --- /dev/null +++ b/drills/0.6.2.md @@ -0,0 +1,38 @@ +# 0.6.2 — drill record + +Measured 2026-08-24 on release PR !250, candidate branch +`build/231-release-0-6-2`. The release-path measurement was taken at +`fdb7d7577b4b30c11f2db9b47f278e2a16783c8c`; this record is the only later +candidate-tree change and `drills/` is outside the release path. + +## Scope ruling — doors unchanged, no disposable-repo rehearsal + +The last rehearsed tag is `0.6.1`. All three doors-unchanged conditions in +`drills/README.md` hold at this candidate tree: + +1. `git diff 0.6.1..HEAD -- $(sh .github/scripts/release-path.sh)` changes + only the `CEREMONY_SELF_REF` pin in `.github/workflows/release.yml`, from + `0.6.1` to `0.6.2`. No release-door logic, decision, fact gathering, + version handling, changelog handling, or publish step changed. +2. The measured release path is exactly the output of + `.github/scripts/release-path.sh`: + + ```text + .github/workflows/release.yml + bin/ + lib/version.sh + lib/decide.sh + lib/facts.sh + lib/changelog.sh + lib/forge.sh + ``` + +3. `drills/0.6.1.md` records a full six-probe rehearsal. The Forgejo release + API reported `0.6.1` published at `2026-08-09T19:46:56Z`, neither draft nor + prerelease, and `origin/main:VERSION` read `0.6.2-dev`, confirming that main + was re-armed after that release. + +A new disposable-repo rehearsal would therefore execute the same release-door +bytes as the full 0.6.1 rehearsal. This record asserts only the mechanically +checked doors-unchanged case; the release panel may still rule that a full +rehearsal is owed.