Skip to content

Commit c79fded

Browse files
kixelatedmoq-bot[bot]claudequidamschwarznuts-rice
authored
Merge main into dev (#1848)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: moq-bot[bot] <186640430+moq-bot[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: quidamschwarz <113550619+quidamschwarz@users.noreply.github.com> Co-authored-by: nuts-rice <red44443@gmail.com> Co-authored-by: Luke Curley <luke.curley@discordapp.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 5413ba6 commit c79fded

101 files changed

Lines changed: 5500 additions & 1651 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ updates:
3232
cargo:
3333
patterns:
3434
- "*"
35+
ignore:
36+
# reqwest-middleware 0.5 requires reqwest 0.13, but http-cache-reqwest's
37+
# latest stable (0.16) still pins reqwest 0.12 / reqwest-middleware 0.4.
38+
# The only pairing is http-cache-reqwest 1.0.0-alpha (pre-release), so we
39+
# hold reqwest-middleware at 0.4 until that line ships stable.
40+
- dependency-name: "reqwest-middleware"
41+
versions: [">=0.5"]
3542

3643
- package-ecosystem: "bun"
3744
directory: "/"

.github/workflows/check.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,22 @@ permissions:
66

77
on:
88
pull_request:
9+
# `closed` is here only so merging/closing a PR cancels its in-flight run
10+
# via the concurrency group below; the job itself is skipped on close.
11+
types: [opened, synchronize, reopened, closed]
912

10-
# Cancel in-flight runs when a new commit lands on the same PR.
13+
# Cancel in-flight runs when a new commit lands on the same PR, or when the PR
14+
# is merged/closed (the close event shares this group and supersedes the build).
1115
concurrency:
1216
group: check-${{ github.ref }}
1317
cancel-in-progress: true
1418

1519
jobs:
1620
check:
1721
name: Check
22+
# Skip the actual work on close/merge: this run exists only to cancel the
23+
# superseded in-flight build via the concurrency group above.
24+
if: github.event.action != 'closed'
1825
# Trusted events run on the moq-dev self-hosted A1 runner (warm /nix/store +
1926
# persistent CARGO_TARGET_DIR). Fork PRs fall back to GitHub-hosted ARM so
2027
# untrusted code never runs on the box.

CLAUDE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,14 @@ Changes in one area usually need matching updates elsewhere, including docs. If
215215
| `rs/moq-token` | `js/token` |
216216
| `rs/moq-relay` config/behavior | `doc/bin/relay/` |
217217
| `rs/moq-cli` | `doc/bin/cli.md` |
218+
| `rs/moq-token-cli` | `doc/bin/relay/auth.md`, `doc/lib/rs/crate/moq-token.md`, `doc/lib/rs/index.md` |
218219
| `rs/moq-gst` | `doc/bin/gstreamer.md` |
219220
| `js/{watch,publish}` UI/API | `demo/web` if it consumes the API |
220221

221222
For `swift/`, the wrapper re-exports `moq-ffi` records/enums via typealias, so new catalog/audio *fields* flow through automatically. Only a new FFI *method* (or a renamed/removed one) needs a matching change in the de-prefixed `Sources/Moq` wrapper.
222223

224+
**When a command-line tool's interface changes (a flag, argument, subcommand, or positional renamed/added/removed/reordered), update every doc that shows an example invocation, not just the tool's primary page.** Sample commands for `moq-cli`, `moq-relay`, and `moq-token-cli` are scattered across `doc/bin/`, `doc/lib/`, `doc/setup/`, and `doc/concept/`, plus the `justfile`s under `demo/`. Grep the whole repo for the binary name and reconcile each hit against the binary's `--help`. A stale example that no longer parses is worse than no example.
225+
223226
## Branch Targeting
224227

225228
Two long-lived branches:

Cargo.lock

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ moq-token = { version = "0.6", path = "rs/moq-token" }
7272
# Standalone crate (moq-dev/vaapi); vendored from cros-libva + cros-codecs.
7373
moq-vaapi = "0.0.2"
7474
moq-video = { version = "0.0.4", path = "rs/moq-video" }
75-
qmux = { version = "0.1.3", default-features = false }
75+
qmux = { version = "0.2", default-features = false }
7676
serde = { version = "1", features = ["derive"] }
7777
tokio = "1.48"
7878
web-async = { version = "0.1.4", features = ["tracing"] }

0 commit comments

Comments
 (0)