Skip to content

fix(release): validate stable integration through native merge queue - #55

Merged
choskeli merged 4 commits into
mainfrom
fix/stable-release-queue
Oct 28, 2026
Merged

choskeli merged 4 commits into
mainfrom
fix/stable-release-queue

Conversation

@choskeli

@choskeli choskeli commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

A release PR can pass a long CI run and become behind main again before merging. Repeated Update branch clicks restart that work. This proposes GitHub's native merge queue so GitHub validates the integrated candidate and later PRs wait behind it.

  • Add merge_group: checks_requested to both required workflows. CI concurrency identifies the exact queue SHA. The title check reads paginated PR metadata, binds mergeQueueEntry.headCommit and baseCommit to the event, and rejects missing, changed, duplicate, or invalid candidates without checking out PR code.
  • Add reviewed Terraform queue settings: SQUASH, ALLGREEN, one candidate building/merging, no batch wait, 180-minute timeout. Extend the required-check contract and fixtures so a missing or filtered queue check fails before activation.
  • Preserve strict checks, app bindings, no bypass, zero mandatory PR reviews, and the single final owner environment approval. The publisher, tagged-source ancestry, sealed artifacts, checksums, SBOM, and provenance are unchanged. The main audit retains original PR-head admission evidence; the native ruleset enforces queue integration checks.

Release Please keeps updating real version/changelog changes. A changed release PR or failed check requires fresh checks/requeueing; ordinary main advancement no longer requires manual branch updates after queue activation. The maintainer enqueues using their existing account: GITHUB_TOKEN cannot enqueue, and this adds no credentials or automatic enqueue bot. Initial bot-generated checks may still require a close/reopen and workflow-execution decision.

Review and hosted status

Current head: b3078298447e0581a477c939b7461594217d10b0, based on main 0cea08d0e3d6bd96155badacc9cdb21ad262d5c6; tree 49cd37e701ecb7adaa990fc72c968cca7e6c878f. The PR is conflict-free, up to date with this main commit, and remains draft for final parent review. Required hosted checks passed.

  • Native CI run 40620894898 passed at 2026-10-28 02:35:06 UTC, with 34/34 jobs successful. Required All checks, PR title and CodeQL passed. All 11 cold mutation partitions and the collected audit passed: 1,289 mutants, 100% adjusted.
  • Hosted evidence: 695 tooling tests, 162 mutation-policy tests and 32 Terraform policies passed; runtime 2,141 passed / 2 skipped with 100% coverage on Node 24 and 26; pure runtime mutation 215 killed / zero survivors; artifact smoke 76 scenarios passed. The tested PR merge 553cd119a3a31384fc0d365b6103ad301297fd3e binds current main and this head and has the identical reviewed source tree 49cd37e701ecb7adaa990fc72c968cca7e6c878f.
  • Independent integration review found no new P1/P2 findings. The final refresh adds exactly the merged PR refactor: clarify parser mode and stabilize test seams #54 delta (16 files, +440/−130), with no manual edits. The queue patch against current main is identical to the previously reviewed patch (62 files, +607/−18).
  • Queue-SHA isolation, exact candidate metadata validation, cold-PR routing, baseline provenance and publisher protections are preserved. The prior PR docs: consolidate guides and correct stale claims #52 reconciliation retains canonical release-procedure links and the consolidated documentation.
  • The original queue head 25bb6d7 passed CI run 40609199752, including All checks and parser mutation (29m20s). Its independent review verified 644 tooling tests, 32 mocked Terraform policies and valid candidate acceptance plus 13 invalid metadata cases. Earlier-head successes do not substitute for the current head's required checks.

Local evidence on the final head

  • 131/131 focused regressions passed: queue/main concurrency, actual queue-title program, exact-head admission evidence, release contracts, cold/warm mutation routing, native partitions, fail-closed collection and workflow contracts.
  • Terraform 1.16.7 formatting/validation and 32/32 mocked policy tests passed with locked provider 6.13.0; no live settings were applied.
  • Repository-wide actionlint 1.7.12, Prettier, ESLint, both TypeScript compilers and diff whitespace checks passed.
  • The preserved governance/releasing reconciliation passed 38 relative links/anchors before this source-only upstream integration.
  • Full local npm run check was not repeated: earlier sandbox HTTP restrictions and Windows-incompatible Linux shell fixtures were documented, with the prior hosted Linux run passing. Required hosted validation passed for this final head. No additional local full mutation campaign was launched.

Activation remains separate

Merging this PR does not activate the queue. After merge, explicitly authorize and review a Terraform plan updating existing main ruleset 25840882, then approve/apply it. Do not create a duplicate ruleset. Verify two ordinary PRs queue/merge FIFO without branch updates and that failed checks block, including the real ephemeral-token metadata path. Do not publish a release during acceptance. The current strict-update behavior remains until activation.

This follows GitHub's supported queue model, the pinned Release Please action's own queue CI, and provider 6.13.0 support. A stable release branch would add branch/backport policy and change the existing main-ancestor publisher contract; it is unnecessary for this integration problem.

@choskeli
choskeli marked this pull request as ready for review October 28, 2026 02:45
@choskeli
choskeli merged commit 846146a into main Oct 28, 2026
41 checks passed
@choskeli
choskeli deleted the fix/stable-release-queue branch October 28, 2026 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants