diff --git a/rs/hang/Cargo.toml b/rs/hang/Cargo.toml index 57703d3cd4e..8646a7d2cb8 100644 --- a/rs/hang/Cargo.toml +++ b/rs/hang/Cargo.toml @@ -31,7 +31,7 @@ features = ["from", "display", "debug"] [dev-dependencies] anyhow = { workspace = true } moq-mux = { path = "../moq-mux" } -moq-tokio = { workspace = true, features = ["noq", "aws-lc-rs", "websocket"] } +moq-tokio = { path = "../moq-tokio", default-features = false, features = ["noq", "aws-lc-rs", "websocket"] } tokio = { workspace = true, features = ["macros", "fs"] } tracing = { workspace = true } url = { workspace = true } diff --git a/rs/justfile b/rs/justfile index 1fcc5f0825b..390f9c5f25f 100644 --- a/rs/justfile +++ b/rs/justfile @@ -363,6 +363,10 @@ _select-test: # Published crates need the current workspace version as the lower bound for # internal dependencies. The workspace only tests that version set, and a looser # bound lets package verification combine incompatible older releases. +# +# Internal dev-dependencies must be path-only. `cargo publish` keeps a versioned +# dev-dependency and requires it on crates.io, but release-plz orders publishes +# by normal dependencies only, so a bumped dev-dependency is often not there yet. [private] _publish-test: #!/usr/bin/env bash @@ -387,6 +391,22 @@ _publish-test: exit 1 fi + versioned=$(jq -r ' + .packages[] + | select(.publish != []) + | .name as $package + | .dependencies[] + | select(.source == null and .path != null and .kind == "dev" and .req != "*") + | "\($package): \(.name) \(.req)" + ' <<< "$metadata") + + if [[ -n "$versioned" ]]; then + echo "rs: published crates have versioned workspace dev-dependencies:" >&2 + echo "$versioned" >&2 + echo "use { path = \"../\" } instead of { workspace = true }." >&2 + exit 1 + fi + echo "rs: published workspace dependencies current" # Takes a newline-separated list of changed files; skips when no crate is diff --git a/rs/libmoq/Cargo.toml b/rs/libmoq/Cargo.toml index 70a1bafcee5..22c7c5be679 100644 --- a/rs/libmoq/Cargo.toml +++ b/rs/libmoq/Cargo.toml @@ -44,4 +44,4 @@ url = { workspace = true } cbindgen = "0.29" [dev-dependencies] -moq-loc = { workspace = true } +moq-loc = { path = "../moq-loc" } diff --git a/rs/moq-cli/Cargo.toml b/rs/moq-cli/Cargo.toml index dcde06182b0..9c496a7b7b4 100644 --- a/rs/moq-cli/Cargo.toml +++ b/rs/moq-cli/Cargo.toml @@ -126,7 +126,7 @@ sd-notify = { workspace = true } # Authors an MSF-only catalog, which is the one shape that tells a completer reading # the wrong catalog track apart from one reading the right one: `moq-mux`'s producer # publishes hang and MSF from the same source, so both answer for an ordinary broadcast. -moq-msf = { workspace = true } +moq-msf = { path = "../moq-msf" } tempfile = { workspace = true } # `test-util` enables `tokio::time::pause` so the TS round-trip test simulates the # exporter drain timeouts instantly instead of waiting on the wall clock. diff --git a/rs/moq-hls/Cargo.toml b/rs/moq-hls/Cargo.toml index ec72c240260..706db305927 100644 --- a/rs/moq-hls/Cargo.toml +++ b/rs/moq-hls/Cargo.toml @@ -35,6 +35,6 @@ tracing = { workspace = true } url = { workspace = true } [dev-dependencies] -moq-tokio = { workspace = true, features = ["tcp", "noq", "aws-lc-rs"] } +moq-tokio = { path = "../moq-tokio", default-features = false, features = ["tcp", "noq", "aws-lc-rs"] } tokio = { workspace = true, features = ["test-util"] } tower = { version = "0.5", features = ["util"] } diff --git a/rs/moq-relay/Cargo.toml b/rs/moq-relay/Cargo.toml index a3b150225f4..84372ade1c3 100644 --- a/rs/moq-relay/Cargo.toml +++ b/rs/moq-relay/Cargo.toml @@ -89,7 +89,7 @@ moq-uring = { workspace = true, optional = true } sd-notify = { workspace = true } [dev-dependencies] -moq-auth = { workspace = true, features = ["client", "serve"] } +moq-auth = { path = "../moq-auth", features = ["client", "serve"] } rcgen = "0.14" tempfile = { workspace = true } tokio = { workspace = true, features = ["test-util"] } diff --git a/rs/moq-room/Cargo.toml b/rs/moq-room/Cargo.toml index 8c8b47e404f..71121853d5a 100644 --- a/rs/moq-room/Cargo.toml +++ b/rs/moq-room/Cargo.toml @@ -21,5 +21,5 @@ thiserror = { workspace = true } web-async = { workspace = true } [dev-dependencies] -moq-tokio = { workspace = true } +moq-tokio = { path = "../moq-tokio", default-features = false } tokio = { workspace = true, features = ["macros", "rt", "test-util"] } diff --git a/rs/moq-rtc/Cargo.toml b/rs/moq-rtc/Cargo.toml index a740f958488..59de7aeb0f3 100644 --- a/rs/moq-rtc/Cargo.toml +++ b/rs/moq-rtc/Cargo.toml @@ -33,5 +33,5 @@ uuid = { version = "1", features = ["v4"] } # Signs the MESSAGE-INTEGRITY on a forged STUN binding request: str0m rejects a # request without one, and its own SHA1 provider is private. aws-lc-rs = { workspace = true } -moq-tokio = { workspace = true } +moq-tokio = { path = "../moq-tokio", default-features = false } tokio = { workspace = true, features = ["test-util"] } diff --git a/rs/moq-rtmp/Cargo.toml b/rs/moq-rtmp/Cargo.toml index a0c8e38ce5c..44a6dab4b30 100644 --- a/rs/moq-rtmp/Cargo.toml +++ b/rs/moq-rtmp/Cargo.toml @@ -58,5 +58,5 @@ tracing = { workspace = true } # `rustls::ServerConfig`. No transport feature: a QUIC backend here would be # unified into every other crate a `--workspace` build selects, which is exactly # what hid moq-tokio's backend-less build from the nightly feature matrix. -moq-tokio = { workspace = true, default-features = false, features = ["aws-lc-rs"] } +moq-tokio = { path = "../moq-tokio", default-features = false, features = ["aws-lc-rs"] } tokio = { workspace = true, features = ["test-util"] } diff --git a/rs/moq-srt/Cargo.toml b/rs/moq-srt/Cargo.toml index 9209f58554d..26ca13b9be6 100644 --- a/rs/moq-srt/Cargo.toml +++ b/rs/moq-srt/Cargo.toml @@ -28,5 +28,5 @@ tracing = { workspace = true } [dev-dependencies] # Builds the synthetic broadcasts the egress tests mux back to TS. -hang = { workspace = true } +hang = { path = "../hang" } srt-protocol = "0.4" diff --git a/rs/moq-transcode/Cargo.toml b/rs/moq-transcode/Cargo.toml index 7a50e8f6d4d..38106e1d44a 100644 --- a/rs/moq-transcode/Cargo.toml +++ b/rs/moq-transcode/Cargo.toml @@ -44,7 +44,7 @@ tracing = { workspace = true } [dev-dependencies] anyhow = { workspace = true } -moq-tokio = { workspace = true, features = ["noq", "aws-lc-rs", "websocket"] } +moq-tokio = { path = "../moq-tokio", default-features = false, features = ["noq", "aws-lc-rs", "websocket"] } # test-util unlocks tokio::time::pause for the deterministic live-feed tests. tokio = { workspace = true, features = ["full", "test-util"] } url = { workspace = true } diff --git a/rs/moq-uring/Cargo.toml b/rs/moq-uring/Cargo.toml index c87de2ee0ed..4be6dd8895b 100644 --- a/rs/moq-uring/Cargo.toml +++ b/rs/moq-uring/Cargo.toml @@ -53,7 +53,7 @@ tokio = { workspace = true, features = ["macros", "net", "rt", "sync", "time"] } io-uring = { workspace = true } libc = { workspace = true } moq-noq-udp = { workspace = true } -moq-tokio = { workspace = true, features = ["noq", "aws-lc-rs"] } +moq-tokio = { path = "../moq-tokio", default-features = false, features = ["noq", "aws-lc-rs"] } nix = { workspace = true } rcgen = { version = "0.14", default-features = false, features = ["pem", "aws_lc_rs"] } rustls = "0.23"