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
14 changes: 12 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@
overlays = [ (import rust-overlay) ];
};

wasm-bindgen-version =
(pkgs.lib.findSingle (package: package.name == "wasm-bindgen")
(throw "Cargo.lock has no wasm-bindgen package")
(throw "Cargo.lock has multiple wasm-bindgen versions")
(builtins.fromTOML (builtins.readFile ./Cargo.lock)).package

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Keep the benchmark lockfile in step with the selected CLI

When the root Cargo.lock advances to another wasm-bindgen version, this switches the shell's global CLI while bench/ffi-gen/Cargo.lock remains independently pinned. bench/ffi-gen/run.sh builds its UniFFI WASM artifact with that second lockfile and then invokes the global wasm-bindgen, so the next root-only bump will make the benchmark fail with the same schema mismatch this change is intended to prevent. Either derive that build from the root lock too or add an explicit synchronization guard for the nested lockfile.

Useful? React with 👍 / 👎.

).version;
wasm-bindgen-cli =
pkgs.${"wasm-bindgen-cli_${builtins.replaceStrings [ "." ] [ "_" ] wasm-bindgen-version}"}
or (throw "nixpkgs does not package wasm-bindgen-cli ${wasm-bindgen-version} locked in Cargo.lock");

# Pinned build toolchain (not latest stable) so `nix develop` and CI
# compile against a fixed rustc and the relay's MSRV can't creep up
# unnoticed. The floor is 1.98, not the 1.95 relay MSRV: earlier rustc
Expand Down Expand Up @@ -144,8 +154,8 @@
# Source-based test coverage (`just rs coverage`).
cargo-llvm-cov
# Browser/WASM bindings (rs/moq-wasm -> @moq/wasm via `just js wasm`).
# wasm-bindgen-cli must match the `wasm-bindgen` crate version (the
# crate is pinned to nixpkgs' CLI version); bump both together.
# Cargo.lock selects the matching schema version, independently of
# nixpkgs' default wasm-bindgen-cli.
wasm-bindgen-cli
]
++ gstreamerDeps
Expand Down
1 change: 0 additions & 1 deletion quest/m0/ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ The historical samples locate candidates; they are not controlled benchmarks.

## Required

- [Cargo.lock pins wasm-bindgen](/quest/m0/ci/wasm-bindgen-pin.md) - the dev shell's wasm-bindgen CLI follows `Cargo.lock`, so a nixpkgs bump cannot break WASM on `main`
- [One CI pass](/quest/m0/ci/one-pass.md) - the queue's Linux gate is one `just ci` job once Check sheds its permutations
- [Require the release gates](/quest/m0/ci/release-gates.md) - release PRs require platform and the optional workflows; main requires only the Linux gate
- [CI pipeline audit](/quest/m0/ci/audit.md) - every queue and nightly job earns its minutes, and the Rust cache reuses unchanged crates
Expand Down
30 changes: 0 additions & 30 deletions quest/m0/ci/wasm-bindgen-pin.md

This file was deleted.

4 changes: 2 additions & 2 deletions quest/m1/audit-test-cost.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ What the m0 run (2026-10-19) learned; check these first:
[macOS QUIC connects](/quest/m1/test-flakes-2/macos-quic-connect.md), and
[nightly media players](/quest/m1/media-engines-nightly.md). Owned
elsewhere: release builds by [release builds link](/quest/m0/release-link.md),
Rust advisories by the dependency audit, and the Nix wasm-bindgen pin by
[Cargo.lock pins wasm-bindgen](/quest/m0/ci/wasm-bindgen-pin.md).
and Rust advisories by the dependency audit. The Nix wasm-bindgen CLI now
follows `Cargo.lock` ([#6031](https://github.com/moq-dev/moq/pull/6031)).

Baselines from queue run
[39371990135](https://github.com/moq-dev/moq/actions/runs/39371990135):
Expand Down
4 changes: 2 additions & 2 deletions rs/moq-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ moq-net = { workspace = true }
thiserror = { workspace = true }
tracing-wasm = "0.2"
url = { workspace = true }
# Pinned to the wasm-bindgen-cli version in the Nix dev shell: the bindgen
# schema must match exactly between crate and CLI. Bump both together.
# The bindgen schema must match exactly between crate and CLI. The Nix dev
# shell selects its CLI from the resolved version in Cargo.lock.
wasm-bindgen = "=0.2.129"
wasm-bindgen-futures = "0.4"
web-async = { workspace = true }
Expand Down