Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,16 +370,14 @@ jobs:
# `rs hls-conformance` probes every segment moq-hls serves with ffprobe, against its playlists and manifest.
# `gate` runs the queue's Check over every package, catching what a
# diff-scoped queue run let into main.
# `rs send-depth` proves moq-net's futures Send at the default recursion
# limit on the flake's pinned nightly, which the land gate leaves out.
# `rs audio-devices` plays moq-audio's device tests into a private null sink.
# `rs multicast` runs the mDNS tests, which loop multicast back on the runner.
# `rs render-sw` renders through wgpu on Mesa's software Vulkan driver.
# `test qmux` runs js/qmux against the in-tree Rust qmux, per draft.
# `rs v4l2` streams moq-video's V4L2 capture from the kernel's vivid
# virtual camera, a module load no pull request job should make.
# `js worklet-matrix` loads `?worklet` output through the bundlers pinned in test/worklet.
recipe: ["gate", "gh test-integration", "rs doctest --workspace", "rs send-depth", "test drill-sensitivity", "rs uring", "test drain", "test json-properties", "test resume-model", "test route-key-model", "test route-sweep", "rs quic-sim", "rs rung-disable", "test drill impaired", "rs cli-export", "rs hls-conformance", "rs quic-stress", "rs audio-devices", "rs multicast", "rs render-sw", "test qmux", "rs v4l2", "js worklet-matrix"]
recipe: ["gate", "gh test-integration", "rs doctest --workspace", "test drill-sensitivity", "rs uring", "test drain", "test json-properties", "test resume-model", "test route-key-model", "test route-sweep", "rs quic-sim", "rs rung-disable", "test drill impaired", "rs cli-export", "rs hls-conformance", "rs quic-stress", "rs audio-devices", "rs multicast", "rs render-sw", "test qmux", "rs v4l2", "js worklet-matrix"]
include:
# Miri interprets kio's and moq-net's in-memory unsafe; too slow for the merge gate.
- recipe: rs miri
Expand Down
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,8 @@

runner-userns-profile = import ./nix/runner/unshare.nix { inherit pkgs; };

# Nightly's `just rs send-depth` proves native Send futures on it.
# Pinned so a toolchain release alone never fails that job;
# The gate's `just rs send-depth` proves moq-net's Send futures on it.
# Pinned so a toolchain release alone never fails that check;
# bump it on purpose, like the stable toolchain above. Kept out of
# the dev shell, which every CI job downloads.
rust-nightly = pkgs.rust-bin.nightly."2026-10-18".minimal;
Expand Down
3 changes: 2 additions & 1 deletion quest/m0/ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ gate drops `loom-check` and Nightly its loom job; a separate PR deletes the
models. On Send-depth: "Move it to Nightly." It guards a real downstream
breakage (moq-net futures not Send at the default recursion limit), so
`just rs send-depth` keeps its pinned nightly and runs as its own Nightly job
instead of in the land gate.
instead of in the land gate. Superseded 2026-11-13 (maintainer): it gates
moq-net changes again, since a Nightly-only check let a break land on `main`.

Decided 2026-10-25 (maintainer): across moq's many CI and release builds
(targets, features, FFI languages, Nix packages), each crate configuration
Expand Down
37 changes: 0 additions & 37 deletions quest/m0/nightly/send-depth-gate.md

This file was deleted.

4 changes: 2 additions & 2 deletions rs/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ quic-sim:
rung-disable:
just rs test -p moq-ffi --lib --run-ignored only --no-capture -E 'test(/^test::rung::/)'

# Prove downstream futures are Send at the default recursion limit on the
# flake's pinned nightly. Nightly runs it; the land gate does not.
# Prove the session driver and downstream futures are Send at the default recursion limit on the
# flake's pinned nightly. The gate's rs lint phase runs it when moq-net is selected; Nightly runs it too.
send-depth:
bash sh/rs/send-depth.sh

Expand Down
6 changes: 4 additions & 2 deletions sh/rs/select.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ select_packages() {
sed -n '\|^rs/[^/]*/benches/|d; s|^rs/\([^/]*\)/.*|\1|p' "$list"
# moq-relay's tests read its NixOS module.
sed -n 's|^nix/modules/moq-relay\.nix$|moq-relay|p' "$list"
# The gate's Send-depth proof of moq-net's session driver is this script.
sed -n 's|^sh/rs/send-depth\.sh$|moq-net|p' "$list"
jq -r --rawfile list "$list" '
def resolve: gsub("\\\\"; "/") | reduce split("/")[] as $s ([];
if $s == ".." then .[:-1] elif $s == "." then . else . + [$s] end) | join("/");
Expand Down Expand Up @@ -156,8 +158,6 @@ case "$action" in
check | check-test | lint)
# The isolated feature builds (`just rs features`) stay out of the
# gate; the Features workflow runs them nightly and on release PRs.
# Nightly runs the Send-depth proof (`just rs send-depth`) on its
# pinned toolchain.
just rs "$action" "${flags[@]}"
# The test build enables device features, which can hide unused items
# in the default-feature test cfg. Keep this compile isolated from the
Expand All @@ -172,6 +172,8 @@ case "$action" in
fi
# moq-net without `async`, which every other build unifies back in.
if wants moq-net; then just rs no-async; fi
# The session driver's Send proof, which a deeper session state breaks.
if [[ "$action" == lint ]] && wants moq-net; then just rs send-depth; fi
# moq-cli's media tasks are behind `play`; only check-test runs tests.
if [[ "$action" == check-test ]] && wants moq-cli; then just rs play; fi
;;
Expand Down
13 changes: 9 additions & 4 deletions sh/rs/select.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,21 @@ def test_gate_runs_no_feature_matrix(self):
for owner in ("tokio", "media", "net"):
self.assertEqual(self.selected(f"sh/rs/{owner}-features.sh"), [])

def test_gate_leaves_send_depth_to_nightly(self):
# Nightly runs `rs send-depth` on the pinned toolchain.
def test_gate_proves_send_depth_for_net(self):
# moq-net and its dependencies can deepen the session driver's Send proof.
for path in ("rs/moq-net/src/lib.rs", "rs/kio/src/lib.rs", "Cargo.lock"):
with self.subTest(path=path):
calls = self.selected(path)
self.assertEqual(len(calls), 3, calls)
self.assertEqual(len(calls), 4, calls)
self.assertTrue(calls[0].startswith("rs lint "), calls)
self.assertEqual(calls[1], "rs media-defaults", calls)
self.assertEqual(calls[2], "rs no-async", calls)
self.assertEqual(self.selected("sh/rs/send-depth.sh"), [])
self.assertEqual(calls[3], "rs send-depth", calls)
# The script that runs the proof selects moq-net, so an edit to it is proved too.
self.assertIn("rs send-depth", self.selected("sh/rs/send-depth.sh"))
# Only the lint phase runs it, so the gate compiles it once.
self.assertNotIn("rs send-depth", self.selected("rs/moq-net/src/lib.rs", action="test"))
self.assertNotIn("rs send-depth", self.selected("rs/moq-auth/src/lib.rs"))

def test_media_defaults_are_isolated_from_device_features(self):
for path in ("rs/moq-audio/src/lib.rs", "rs/moq-video/src/lib.rs", "Cargo.lock"):
Expand Down
8 changes: 5 additions & 3 deletions sh/rs/send-depth.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env bash
# Prove native downstream futures at the default recursion limit on the
# flake's pinned nightly, so only a pin bump changes the compiler it checks.
# Prove the session driver and native downstream futures Send at the default
# recursion limit on the flake's pinned nightly, so only a pin bump changes the
# compiler it checks. `async` is off by default, and without it the lib has no
# driver and the `send` test compiles to nothing.
set -euo pipefail

cd "$(git rev-parse --show-toplevel)"
Expand Down Expand Up @@ -32,4 +34,4 @@ export RUSTDOC="$send_sysroot/bin/rustdoc"
export RUSTFLAGS="${RUSTFLAGS:+$RUSTFLAGS }-D recursion_depth_exceeding_limit"
rustc --version
cargo --version
cargo check --locked -p moq-net --test send
cargo check --locked -p moq-net --features async --lib --test send