From 605568c7fc60fef8f116019343e15799ff721f8b Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sun, 25 Oct 2026 22:51:49 -0700 Subject: [PATCH] quest: plan landing main through quest land Co-Authored-By: Claude Opus 5.5 --- quest/m1/README.md | 2 ++ quest/m1/land-bump.md | 9 +++++++++ quest/m1/land.md | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 quest/m1/land-bump.md create mode 100644 quest/m1/land.md diff --git a/quest/m1/README.md b/quest/m1/README.md index c5ec15315..b2cf1fa55 100644 --- a/quest/m1/README.md +++ b/quest/m1/README.md @@ -20,3 +20,5 @@ are folded into the [exporter's](/quest/m1/ffi-export.md). The - [Exporter](/quest/m1/ffi-export.md) - moq's bindings exported from its crates' `pub` API, replacing the fork - [The exporter refuses what it can't export](/quest/m1/ffi-refuse.md) - `Option<&T>` parameters, unconstrained impl lifetimes, and unreachable objects work or are refused with a span - [Nix builds in the build benchmark](/quest/m1/bench-nix.md) - moq's Nix release builds measured across crane, crane with mbx, crate2nix, and cargo with mbx, so moq can choose how they share compilations +- [Land main through quest land](/quest/m1/land.md) - every queued PR lands as one tested batch through the shared gate +- [Bump quest to quest land](/quest/m1/land-bump.md) - condition: kixelated/quest ships `quest land`; then bump the flake input diff --git a/quest/m1/land-bump.md b/quest/m1/land-bump.md new file mode 100644 index 000000000..b5648c4a8 --- /dev/null +++ b/quest/m1/land-bump.md @@ -0,0 +1,9 @@ +# [XS] Bump quest to quest land + +## Goal + +Condition: a kixelated/quest commit on `main` ships `quest land` +([its plan](https://github.com/kixelated/quest/blob/main/quest/m0/helpers/land.md)). +Check with `git ls-remote https://github.com/kixelated/quest main` and +`quest land --help` from that revision. Then bump the `quest` flake input in +`flake.nix` to that revision, and delete this quest. diff --git a/quest/m1/land.md b/quest/m1/land.md new file mode 100644 index 000000000..8e9193fc6 --- /dev/null +++ b/quest/m1/land.md @@ -0,0 +1,26 @@ +# [S] Land main through quest land + +## Goal + +PRs to `main` land only through `quest land` on a hosted runner: every queued +PR goes into one chain of squash commits, checked once with the repository's +Check steps, and `main` fast-forwards to the longest passing prefix. GitHub's +merge button cannot land around it. + +## Plan + +Decided 2026-10-26 (maintainer), planning moq-dev/moq's merge throughput +([moq-dev/moq#6854](https://github.com/moq-dev/moq/pull/6854)): the batched +gate is shared through kixelated/quest, and this repository adopts it. + +- The push credential is GitHub Actions in a new `main` ruleset's bypass + list, guarded by a test that refuses `contents: write` anywhere but the + land job, as moq.pro's `queue.test.ts` does. The admin role keeps its + emergency bypass. Ruleset writes are the maintainer's. +- The ruleset requires a check that PR heads never carry, so auto-merge only + waits for the gate. `check.yml` drops its `merge_group` trigger. +- Update the contributor docs that describe landing. + +## Required + +- [Bump quest to quest land](/quest/m1/land-bump.md) - condition: kixelated/quest ships `quest land`; then bump the flake input