Repository navigation
✨ release: make v6 an official release line (v6.x.y tags) - #17074
Conversation
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
f38575c
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. @clubanderson this PR is held at Why:
Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path. Review findings from This is a release-policy and workflow-permissions change (12 files under Verified correct
Sequencing gap (medium) — needs the v6 top-up to land with this Not verified (out of my budget, flagging for the approver): the Review findings from Conclusion: I read the workflow and script changes against the v5 tree and found no defect; this needs a second approver because it changes release/publishing behaviour and 13 workflow files, which is a trust surface I do not sign off on alone. The one genuine policy choice is above. What I verified
Note for the author (no action required if intended): the body says the v5 and v6 copies of — hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 |
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
The parameterised tagged-release.yml renames push_v5 to push_line; the contract test must follow. Re-pins TRUSTED_SCRIPTS_TREE. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
There was a problem hiding this comment.
Decision needed: @clubanderson should confirm that the new tagged-release relay is meant to start dispatching v4's own Tagged Release on every successful v4 docker.yml build (v4's copy has a hardcoded workflow_dispatch backstop that will cut a v4.x.y tag whenever Unreleased is non-empty), and rebase — the PR is currently DIRTY against v5.
Routing to a human rather than judging: this edits 12 workflows plus the release/promotion path, so it is a trust-surface change by policy regardless of author. Facts I verified, then the one question.
Verified (read the workflow hunks and the v4 tree, not just the body):
- The
v5→${{ github.ref_name }}generalisation intagged-release.ymlandpromote-stable.ymlis consistently applied (concurrency group,RELEASE_BRANCH/RELEASE_LINE, everybranches/v5,--ref v5,--base v5,gh pr list --base, ancestor check,--target). I found no remaining literalv5in a code path. - Both workflows now fail closed with
check-release-lines.sh --is-release-line "$RELEASE_LINE"before doing anything, and the guard is checked out from the workflow's own ref withpersist-credentials: falseand a sparse checkout of only the manifest and script. - The new
relayjob's token scope iscontents: read+actions: write, which is the minimumgh workflow runneeds.workflow_dispatchruns started withGITHUB_TOKENdo trigger, so the relay mechanism works. TRUSTED_SCRIPTS_TREEinintegration-governance.cjsis re-pinned; a maintainer should confirm the new tree hash is the one computed from this branch'ssrc/scripts.
The one thing a person has to decide — a behaviour change on the live v4 line:
relay fires for any workflow_run.head_branch that is a declared release line and != github.ref_name. With release_lines: [v4, v5, v6], a successful docker.yml push build on v4 now dispatches tagged-release.yml --ref v4. v4's copy of that workflow (not touched by this PR) accepts workflow_dispatch at .github/workflows/tagged-release.yml:142 and its backstop then resolves the v4 tip (:197) and considers it for release (:231). Today v4's workflow_run trigger is dead (that event only fires on the default branch's copy, and v5's copy filtered head_branch == 'v5'), so v4 releases only happen via schedule/manual dispatch. After this PR every v4 build becomes a release opportunity. The PR body describes the relay as being "for non-default lines" with v6 in mind and does not mention v4 — if the v4 effect is intended, say so in the body; if not, the relay if (or the script check) should exclude lines whose own copy is not the generalised one.
Also: mergeable: DIRTY — this needs a rebase onto current v5 before it can land.
I have not approved or changed anything.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
Re-parameterises the new tagged-release.yml state machine on RELEASE_LINE (github.ref_name): concurrency group, decide/backstop/precheck/push_line/ gh-release steps, --is-release-line guard, relay job for non-default lines. test-release-push-retry.sh follows (push_line, RELEASE_LINE env, #9154 decide assertion). TRUSTED_SCRIPTS_TREE re-pinned. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
There was a problem hiding this comment.
HUMAN DECISION NEEDED — @clubanderson sign off that tagged-release.yml on v6 becomes a publishing workflow (tags, GitHub Releases, GHCR retags) and that the new relay job (.github/workflows/tagged-release.yml:217-258, actions: write) may auto-dispatch Tagged Release on every declared line, including v4.
Security delta re-review at cddc939 (previous head 30c64c7). Eight of the nine new commits are upstream v5; the only PR-specific change is the merge resolving tagged-release.yml/test-release-push-retry.sh against #17083.
Verified in the delta
relayfilter unchanged:workflow_run+conclusion == 'success'+event in (push, workflow_dispatch)+head_branch != ref_name(tagged-release.yml:218-222), then^v[0-9]+$andcheck-release-lines.sh --is-release-linefrom the default-branch checkout (:248-256) before--ref "$LINE"(:258).decidestill requiresevent in (push, workflow_dispatch)before trustinghead_branch(:270-273);RELEASE_LINEis guarded by--is-release-line(:357) before it reaches jq/regex/--ref/--base(:310,391,491).TRUSTED_SCRIPTS_TREE = 'c06705a4339105f9cdc51220053c319a2b90dce1'(integration-governance.cjs:12) equalsrev-parse cddc939:src/scripts.- No
v5literal remains in any non-comment code path oftagged-release.yml.
Previous findings
- [security] workflow + release-publishing change needs maintainer sign-off — still present (it is the nature of the PR, not a defect; decision above).
- [intent-alignment] relay also dispatches Tagged Release for
v4— still present:release_lines: [v4, v5, v6](.github/release-lines.yml:42), so av4push build now auto-dispatchesv4's own copy (which is self-consistent:concurrency: tagged-release-v4,RELEASE_LINE: v4atv4:tagged-release.yml:145,258), turningv4from manual-dispatch-only into auto-releasing. Either excludev4in the relay or state this is intended.
New (low) — the merge dropped the comment that explains why the event filter makes head_branch trustworthy (fork PR head_branch can be named v5). The code is intact at :270-273; only the rationale guarding against a future "simplification" is gone. Suggested restore at tagged-release.yml:262-266:
# workflow_run: only a successful docker.yml build of a real push to, or
# a workflow_dispatch on, the release line. The event filter is what makes
# `head_branch` trustworthy: docker.yml also runs on `pull_request` with
# no branch filter, and a fork PR's `head_branch` is whatever the fork
# named its branch — `v5` included — so comparing the name alone would
# admit a fork's commit. Push and workflow_dispatch runs are always on one
# of this repository's own branches. Both count (#10863): post-release
# dispatches are harmless because Unreleased is already empty, and the
# backstop below may need to prime docker.yml manually when a busy line's
# current tip has not yet published images.
— hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Needs a decision, not a merge:
Head: verdict requires_human @cddc939, 81/81 checks green, DCO yes, soak 10m0s elapsed. How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Makes
v6an official release line so it gets semver tags (v6.x.y), GitHub Releases, SBOM/NOTICE artefacts and immutable image retags the wayv5does. The owner wants to announce "latest is available in v6" with a real version number.What changed
.github/release-lines.ymlrelease_lines: [v4, v5, v6]. v6 stops being an extra on the PR-gating workflows anddocker.yml LONG_LIVED; every pinned lane that does not cover v6 now writes down a-v6exclusion with its reason (fossa, gh-aw-compile, hive-action-smoke-tests, crux-sync, forgejo-smoke, stream-image, v4-freeze-gate, v5-topup, v6-topup).dco-post-merge.yml,dco-push-delta.yml,docs-link-check.yml,podman-{arm64,rootful,rootless}-lane.yml,podman-contract.yml,quadlet-gate.yml,suid-contract.yml,scorecard.ymlv6added to the branch filters (and the dco-post-merge matrix) — the core release-line gates the guard exists to carry forward.tagged-release.ymlRELEASE_LINE: ${{ github.ref_name }},concurrency: tagged-release-${{ github.ref_name }},--is-release-linerefusal, trusted-event filter onworkflow_run), so the v5 and v6 copies are the same file. Fixed the onev5literal that port missed (-f branch=v5in the required-checks GraphQL query). Newrelayjob: GitHub deliversworkflow_run/scheduleonly to the default branch's copy, so when the v5 copy sees docker.yml complete a push/dispatch build on another declared release line, it dispatchestagged-release.yml --ref <line>; that line's own copy then takes the existing backstop path (resolve tip → require published images → compile fragments → derive → release). Event-driven only; the hourly schedule stays a default-branch backstop.promote-stable.ymlgithub.ref_name, refuse non-release-lines). Behaviour on v5 is unchanged: schedule/workflow_runrun on the default branch, sostablekeeps following v5.src/scripts/check-release-lines.sh,test-release-lines-guard.sh--is-release-line <branch>query mode + its self-test (from v6, #9307).TRUSTED_SCRIPTS_TREEre-pinned.src/docs/releases.md,release-line-guard.md,release-channels.mdchangelog.d/added-v6-release-line.mdFirst v6 version
derive-release-version.shwithRELEASE_LINE=v6only looks atv6.*tags; none exist, so the first release is forced tov6.0.0(bump=first), never a bump of v5's number. Verified locally against the v6 tip after compiling itschangelog.d/:Derived release version: v6.0.0 (bump=first). The first v6 release consumes the ~2,130 fragments v6 has accumulated through top-ups (its## Unreleasedhas never been emptied) — that is a large but correct first changelog; norelease: nonemarker is involved (the #17015 rule only forbidsnonein fragments and none carry it). One v6-only fragment (changelog.d/fixed-14225.md, missing its-bullet) makescompile-changelog.shfail on v6 today; the top-up PR that carries this change to v6 fixes it.Channel mapping (unchanged by this PR — documented)
stablepromote-stable.yml(default branch only)candidate,:latestdocker.ymlrowv5 true candidateedge,v6-latestdocker.ymlrowv6 false edge(already on v6)vN.x.yimmutable tags + GitHub Release + SBOMsv5.x.yv6.x.y(new)Do not dispatch
promote-stable.ymlfrom v6:candidateis a single v5-owned tag, and stable stays on v5.Release-line-guard checklist (
src/docs/release-line-guard.md)release_linesin.github/release-lines.yml→[v4, v5, v6]pinnedworkflow either namesv6in its trigger or carries a written-v6exclusion (guard: PASS locally, self-test: PASS)env_listslist covers v6 (docker.yml LONG_LIVEDalready had it; now as a release line, not an extra)derive-release-version.sh: first tag on the line isvN.0.0→v6.0.0tagged-release.ymlservesgithub.ref_name, gated by--is-release-line; relay for non-default linespromote-stable.ymlgated the same way;stableremains default-branch (v5) onlydocker.ymlchannel rows on v6 already sayv6 false edge(hive, hive-contributor, hive-hub) — no changev6-topup.yml/v5-topup.ymlexclusions updated so the guard agrees on every linerelease-lines.yml, workflows, scripts) — follow-up top-up PR v5→v6 (also fixeschangelog.d/fixed-14225.md)Validation
src/scripts/check-release-lines.shPASS,src/scripts/test-release-lines-guard.shPASS,check-changelog-fragment.shOK,actionlintclean on the changed workflows (pre-existing shellcheck infos only).