Skip to content

ci: check in the merge queue and drop the quest land gate - #249

Merged
kixelated merged 1 commit into
mainfrom
move-to-moq-ci-model
Oct 30, 2026
Merged

kixelated merged 1 commit into
mainfrom
move-to-moq-ci-model

Conversation

@kixelated

Copy link
Copy Markdown
Collaborator

Problem

Hosted CI is starved by another repository's backlog, and the quest land gate (#137) never got its App, environment, and ruleset setup. Now that rust2 lives in moq-dev, it can use GitHub's native merge queue and this host's self-hosted runners the way moq-dev/moq does.

Approach

Copies moq's model:

  • just ci runs just check then just test. Check's job calls it, and CONTRIBUTING, AGENTS.md, and README name it as the local check before every push.
  • Check runs in the merge queue. It triggers on pull_request and merge_group (checks_requested, destroyed). Main PRs report Check as skipped, and the queue runs it on vars.RUST2_QUEUE_RUNNER || 'ubuntu-24.04-arm'. The Nix installer is skipped on a self-hosted runner. A destroyed run only cancels its group's in-flight build through the concurrency group. .github/actionlint.yaml ignores destroyed exactly as moq does (Actionlint errors for merge_group event activity type destroyed rhysd/actionlint#726).
  • The quest-land gate is gone. This removes land.yml, land.test.ts and its just test line, CONTRIBUTING's landing rule and interim gh pr merge line, and quest/m1/land.md with its link. CONTRIBUTING gets a Merge queue section. quest merge <pr> <token> --land <sha> enables auto-merge bound to the reviewed head, which enters the base's merge queue when it has one (quest merge --help), so /quest-merge keeps working unchanged.
  • References. kixelated/rust2 becomes moq-dev/rust2 across Cargo.toml repository fields, READMEs, quests, driver/src/rustc.rs, and bench scripts. In quest/m3/quest-workflow-guard.md, the link to the deleted land.test.ts is now a permalink at f78c588f. That quest is kixelated/quest's own gap, so it stays.

Choices made here:

  • Unlike moq, Check here has no closed or edited pull_request types. In moq they only serve release PRs, which run Check. No rust2 PR runs Check, so a close has nothing to cancel.
  • workflow_dispatch stays so Check can run by hand on a branch. It runs on the hosted runner.
  • Nightly and the bench workflows stay on hosted runners, as moq's do.

Impact

  • Public API: none. Crate metadata repository URLs change to moq-dev/rust2.

Alternatives

  • Keep quest land: dropped. It needs an App bypass and an environment secret, and the native queue gives the same combined-tree check.
  • Enqueue with gh pr merge as moq's CONTRIBUTING does: quest merge --land already enters the native queue and binds the reviewed SHA, so the quest skills don't change.

Maintainer steps

  1. Create a moq-dev ruleset for rust2's main that requires the Check status check, enables the merge queue with squash merges, and blocks deletion and force pushes. Keep the admin bypass for emergencies. Retire any earlier main ruleset that requires quest land or names the land App as a bypass actor.
  2. Allow moq-dev/rust2 in the runner group that holds quest-land (org-wide, ephemeral, registered through the moq-bot App).
  3. After a merge-group run has passed on the hosted runner, set the repository variable RUST2_QUEUE_RUNNER=quest-land, then check that the next queue run lands on nixos-quest-land and passes.
  4. Delete the land environment (LAND_APP_CLIENT_ID, LAND_APP_PRIVATE_KEY), and uninstall or delete the land GitHub App if nothing else uses it.

Follow-ups

None.

Review

  • Reviewer: codex, gpt-6.1-sol, medium (quest review --base origin/main, round 1)
  • Head: 9be8ff1
  • Findings: none

Local checks: nix develop --command just ci passed on 9be8ff1.

(written by Claude Opus 5.5)

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 30, 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 56 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: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 31eaa3b8-3e8e-466f-a4c9-0c37958bc208
Commits

Reviewing files that changed from the base of the PR and between f78c588 and 9be8ff1.

Files selected for processing: 62
  • .github/actionlint.yaml
  • .github/land.test.ts
  • .github/workflows/check.yml
  • .github/workflows/land.yml
  • AGENTS.md
  • CONTRIBUTING.md
  • README.md
  • bench/build/README.md
  • bench/ffi/browser.sh
  • driver/Cargo.toml
  • driver/src/rustc.rs
  • ffi/Cargo.toml
  • justfile
  • quest/m1/README.md
  • quest/m1/ffi-export/README.md
  • quest/m1/ffi-export/kotlin-android.md
  • quest/m1/ffi-export/kotlin-reads.md
  • quest/m1/ffi-export/session-quic.md
  • quest/m1/ffi-export/tuples.md
  • quest/m1/land.md
  • quest/m1/uniffi-release.md
  • quest/m2/ts-async.md
  • quest/m2/ts-byte-views/arguments.md
  • quest/m2/ts-byte-views/fields.md
  • quest/m2/ts-byte-views/returns.md
  • quest/m2/ts-model/floats.md
  • quest/m2/ts-model/hashbrown.md
  • quest/m2/ts-model/std-rest.md
  • quest/m2/ts-shared.md
  • quest/m2/ts-std-build.md
  • quest/m2/uniffi-swift-arm.md
  • quest/m3/ffi-from-chains.md
  • quest/m3/ffi-instance-rename.md
  • quest/m3/quest-workflow-guard.md
  • quest/m3/relink.md
  • quest/m3/ts-arc-mut.md
  • quest/m3/ts-bind-gaps.md
  • quest/m3/ts-bytes-capacity.md
  • quest/m3/ts-drop-order.md
  • quest/m3/ts-f32.md
  • quest/m3/ts-fmt-wrappers.md
  • quest/m3/ts-fold-bool.md
  • quest/m3/ts-mut-ref.md
  • quest/m3/ts-ordering.md
  • quest/m3/ts-range-fold.md
  • quest/m3/ts-tsrs.md
  • quest/m3/ts-unsafe.md
  • quest/m4/README.md
  • quest/m4/fork.md
  • quest/m4/subset-compiler.md
  • ts/Cargo.toml
  • uniffi/README.md
  • uniffi/uniffi/Cargo.toml
  • uniffi/uniffi_bindgen/Cargo.toml
  • uniffi/uniffi_build/Cargo.toml
  • uniffi/uniffi_core/Cargo.toml
  • uniffi/uniffi_internal_macros/Cargo.toml
  • uniffi/uniffi_macros/Cargo.toml
  • uniffi/uniffi_meta/Cargo.toml
  • uniffi/uniffi_pipeline/Cargo.toml
  • uniffi/uniffi_testing/Cargo.toml
  • uniffi/uniffi_udl/Cargo.toml
  • 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 30, 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-30T03:04:23.146878Z 9be8ff1 PR opened
🔒 Security Review ✅ Completed 2026-10-30T03:05:59.564334Z 9be8ff1 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.

@kixelated kixelated left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review by review (OpenAI)

Reviewed commit: 9be8ff17303a07cf9847622281968c3bb93cefa7.

No actionable bugs found. Replacing the unused custom Land gate with the native merge queue is a reasonable simplification: just ci retains check-then-test failure propagation, manual runs remain hosted, and merge-group runs have a hosted fallback before the runner variable is configured. Removing the Land-specific guard test matches removal of its workflow; the remaining repository changes are URL migration and corresponding documentation.

The documented rollout prerequisites matter: skipped PR checks are not themselves evidence that the combined tree passed. The required Check plus native queue ruleset and the self-hosted runner's provisioning/isolation still need operational verification. Consider a small event-matrix regression for PR skip, queue/manual execution, and destroyed-event cancellation.

Verification limits: static diff and surrounding workflow/Nix/justfile review, with an independent read-only pass. I did not run checks/tests or verify GitHub rulesets, runner settings, cancellation behavior, or the reported local CI result.

(Written by OpenAI)

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