From afcc95fbbd2cc864a363b3defdc533f49e63b5b6 Mon Sep 17 00:00:00 2001 From: codex-bot-andresmgsl Date: Mon, 24 Aug 2026 00:35:16 +0000 Subject: [PATCH 1/2] docs: record upstream 0.6.3 sync baseline --- changelog.d/231.md | 7 +++++++ docs/UPSTREAM-SYNC.md | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 changelog.d/231.md diff --git a/changelog.d/231.md b/changelog.d/231.md new file mode 100644 index 0000000..aff9c1c --- /dev/null +++ b/changelog.d/231.md @@ -0,0 +1,7 @@ +### Changed + +- Forge release 0.6.2 consolidates upstream 0.6.1 doctrine from upstream #316, #311, #330, and #329, plus upstream 0.6.2's #336 clarification (#231). + +- Upstream 0.6.3's #343 membership record and #327 gate fixes land through Forgejo-adapted reconciler changes rather than upstream bytes (#231). + +- The upstream drill-record fixes at `86dc2eb`, `a72085b`, and `13ffb0d`, plus upstream 0.7.0–0.7.4, remain explicitly deferred (#231). diff --git a/docs/UPSTREAM-SYNC.md b/docs/UPSTREAM-SYNC.md index 84bbd8b..b5b1a4c 100644 --- a/docs/UPSTREAM-SYNC.md +++ b/docs/UPSTREAM-SYNC.md @@ -17,6 +17,27 @@ 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. +## Sync ledger + +### 2026-08-24 — upstream 0.6.1–0.6.3 into forge 0.6.2 + +- **Consumed through:** upstream tag `upstream-0.6.3` + (`cf2892148305ab18ff234fa0a2ef28ab6fef6c0f`). The `upstream-` prefix is + mandatory in this record because bare `0.6.x` names collide with this + forge's own releases and can identify different trees. +- **Previous baseline:** upstream `0.6.0`, merge-base + `8c3a4d1dee2bdb5ac06a632a285bb65ab2615214`. This adoption ported the + upstream changes in #229 and #230 instead of merging upstream ancestry, so + `.upstream-ref` and the Git merge-base intentionally remain at that commit; + `upstream-0.6.3` is the new content baseline for the next campaign. +- **Adapted here:** the membership and gate changes were applied to the + Forgejo reconciler and its tests, and the upstream CONTRIBUTING changes + were reconciled with this forge's roster and conventions rather than copied + byte-for-byte. +- **Deferred:** upstream's drill-record bookkeeping commits `86dc2eb`, + `a72085b`, and `13ffb0d` correct drill files this forge does not mirror. + Upstream 0.7.0–0.7.4 is the next sync campaign's standing queue. + ## The standing resolutions These recur every sync. They are decided; re-deciding them is the cost this -- 2.45.2 From dcdf30dd5a1900be3605d868c69f4a18636934ce Mon Sep 17 00:00:00 2001 From: codex-bot-andresmgsl Date: Mon, 24 Aug 2026 00:36:21 +0000 Subject: [PATCH 2/2] release: stamp forge 0.6.2 refs and version --- .github/workflows/labels-sweep.yml | 2 +- .github/workflows/labels.yml | 2 +- .github/workflows/release.yml | 2 +- VERSION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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/VERSION b/VERSION index 394f84e..b616048 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.2-dev +0.6.2 -- 2.45.2