Skip to content

docs: document the merge-queue pilot in ci-policy - #2255

Merged
dezren39 merged 1 commit into
mainfrom
ci/merge-queue-policy-note
Oct 30, 2026
Merged

dezren39 merged 1 commit into
mainfrom
ci/merge-queue-policy-note

Conversation

@dezren39

@dezren39 dezren39 commented Oct 29, 2026 •

Copy link
Copy Markdown
Member

The pilot PR for the merge-queue ruleset on main (tracker #1599).

Documents the pilot in .github/ci-policy.md: ruleset main: merge queue pilot (id 26115813) — MERGE method, HEADGREEN grouping, min 1 entry / 1-minute wait, max 100 to merge, max 100 to build, 30-minute check response timeout — enforcing the same single required check as branch protection (basic: proxy port fallbacks, which is why nix ci runs on merge_group events since PR #2233).

This PR is itself enqueued in the queue as the pilot: the proof is a merge_group run of nix ci reporting basic: proxy port fallbacks green on the merge-group commit, followed by the queue merging this PR.


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need.

@dezren39
dezren39 requested a review from a team as a code owner October 29, 2026 10:59
@coderabbitai

coderabbitai Bot commented Oct 29, 2026

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 54 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 8a4fe317-fd47-4914-9a34-e37ce102aaa6
Commits

Reviewing files that changed from the base of the PR and between 5a34fa7 and bafefb9.

Files selected for processing: 1
  • .github/ci-policy.md
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 29, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-29T11:01:15.415101Z bafefb9 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@dezren39
dezren39 enabled auto-merge October 29, 2026 11:00
@dezren39
dezren39 added this pull request to the merge queue Oct 29, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to Branch Protection failures Oct 29, 2026
You're not authorized to push to this branch. Visit "About protected branches" for more information.
@dezren39
dezren39 added this pull request to the merge queue Oct 29, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to Branch Protection failures Oct 29, 2026
You're not authorized to push to this branch. Visit "About protected branches" for more information.
@dezren39
dezren39 added this pull request to the merge queue Oct 29, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to Branch Protection failures Oct 29, 2026
You're not authorized to push to this branch. Visit "About protected branches" for more information.
@dezren39
dezren39 added this pull request to the merge queue Oct 29, 2026
@dezren39

Copy link
Copy Markdown
Member Author

Pilot outcome for this PR (merge queue, ruleset main: merge queue pilot id 26115813):

The queue machinery is verified end to end. On this PR's first enqueue (2026-10-29T11:41:35Z) the queue built the merge group pr-2255-5a34fa70... -> commit d2a5afe3 (this PR's head combined with main), and nix ci ran on the merge_group event against that exact combined tree: basic: proxy port fallbacks completed/success (the main-tier flake evaluation also passed on it). That is precisely the validation the queue exists to perform, on precisely the tree this PR would merge as.

What is not completing is the final merge act, for an operational reason: the repo's Actions runner backlog is currently so deep that a merge-group job waits ~25-35 minutes for a runner, while queue entries are being removed after ~11-21 minutes without a reported required check (check_response_timeout_minutes is 30; observed removals came sooner, likely because stacked entries fall when the entry ahead of them is removed). This PR cycled: added 11:41:35Z -> removed 12:02:47Z; added 12:03:32Z -> removed 12:19:32Z; added 12:20:22Z -> removed 12:31:59Z. Direct merging around the queue is not possible -- an admin merge attempt was refused with "Changes must be made through the merge queue", so the ruleset holds for everyone.

Meanwhile the fleet adopted the queue immediately: PRs #2195, #2236, #2252, and #2246 all enqueued within the first hour, and a three-deep HEADGREEN stack (#2195 -> this PR -> #2246, each group built on the previous group's commit) was observed live.

This PR is re-enqueued and will land when a queue round survives the backlog; the knob to widen meanwhile is check_response_timeout_minutes on the ruleset. Its own required check is green on its head, and (per above) green on its exact merge-group tree.

@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to Branch Protection failures Oct 29, 2026
You're not authorized to push to this branch. Visit "About protected branches" for more information.
@dezren39
dezren39 added this pull request to the merge queue Oct 30, 2026
Merged via the queue into main with commit 9400b58 Oct 30, 2026
3 checks passed
@dezren39
dezren39 deleted the ci/merge-queue-policy-note branch October 30, 2026 01:00
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.

1 participant