Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ccb4cd6
chore(quest): claim quest/m0/ci/hakari.md
kixelated Oct 28, 2026
765c265
ci: unify dependency features with a cargo-hakari workspace-hack
kixelated Oct 28, 2026
5bb9a84
ci: isolate third-party features per crate nightly
kixelated Oct 28, 2026
a1b9b43
chore(quest): narrow hakari to the FFI builds and hosted numbers
kixelated Oct 28, 2026
cf2ca1e
ci: leave the workspace-hack's formatting to cargo hakari
kixelated Oct 28, 2026
649b1d2
Merge remote-tracking branch 'origin/main' into quest/m0/ci/hakari
kixelated Oct 28, 2026
6030e8b
Merge main into quest/m0/ci/hakari
kixelated Oct 29, 2026
8cc4751
Merge remote-tracking branch 'origin/main' into hakari-ready-2
kixelated Oct 30, 2026
0c09d2a
Give kio-macros its workspace-hack edge
kixelated Oct 30, 2026
8499085
Merge remote-tracking branch 'origin/main' into quest/m0/ci/hakari
kixelated Oct 30, 2026
8fb0752
Merge remote-tracking branch 'origin/main' into quest/m0/ci/hakari
kixelated Oct 30, 2026
4ec3011
Keep kio-macros out of the workspace-hack
kixelated Oct 31, 2026
5550df1
Merge origin/main into quest/m0/ci/hakari
kixelated Oct 31, 2026
f87fd21
Merge remote-tracking branch 'origin/main' into hakari-iterate
kixelated Nov 1, 2026
56bb115
ci: give every crate but kio-macros the workspace-hack edge
kixelated Nov 1, 2026
7b45a55
ci: run the feature matrix with the workspace-hack disabled
kixelated Nov 1, 2026
a86499b
Merge remote-tracking branch 'origin/main' into hakari-iterate
kixelated Nov 1, 2026
2a0a295
Merge remote-tracking branch 'origin/main' into hakari-iterate2
kixelated Nov 1, 2026
137fb37
chore: merge main and refresh the workspace-hack
kixelated Nov 2, 2026
d351803
ci: disable the workspace-hack for Android cross-builds
kixelated Nov 2, 2026
fb988e8
style: format the hakari dependency checker
kixelated Nov 2, 2026
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
28 changes: 28 additions & 0 deletions .config/hakari.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This file contains settings for `cargo hakari`.
# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.

hakari-package = "workspace-hack"

# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
dep-format-version = "4"

# Setting workspace.resolver = "2" or higher in the root Cargo.toml is HIGHLY recommended.
# Hakari works much better with the v2 resolver. (The v2 and v3 resolvers are identical from
# hakari's perspective, so you're welcome to set either.)
#
# For more about the new feature resolver, see:
# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
resolver = "2"

# Add triples corresponding to platforms commonly used by developers here.
# https://doc.rust-lang.org/rustc/platform-support.html
platforms = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu"]

# Write out exact versions rather than a semver range. (Defaults to false.)
# exact-versions = true

[traversal-excludes]
workspace-members = ["moq-net-fuzz", "moq-quic-fuzz"]

[final-excludes]
workspace-members = ["kio-macros"]
9 changes: 9 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ concurrency:

env:
CARGO_NDK_VERSION: 4.1.2
CARGO_HAKARI_VERSION: 0.9.39

jobs:
android:
Expand Down Expand Up @@ -58,5 +59,13 @@ jobs:
- name: Install cargo-ndk
run: cargo install --locked "cargo-ndk@$CARGO_NDK_VERSION"

# The host dev-dependencies in the workspace-hack need the Nix shell's
# native libraries, which this cross-build deliberately runs without.
- name: Disable the workspace-hack
run: |
cargo install --locked "cargo-hakari@$CARGO_HAKARI_VERSION"
cargo hakari disable
cargo update --workspace

- name: Check
run: just rs android
5 changes: 5 additions & 0 deletions .github/workflows/features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ jobs:
with:
access-key-id: ${{ secrets.MBX_R2_ACCESS_KEY_ID }}
secret-access-key: ${{ secrets.MBX_R2_SECRET_ACCESS_KEY }}
# The workspace-hack unifies third-party features so the gate's builds
# share a cache, which would hide a crate using a feature it does not
# declare. Every build here checks declarations, so it runs without it.
- name: Disable the workspace-hack
run: nix develop --command bash -c 'cargo hakari disable && cargo update --workspace'
- name: Check feature and profile variants
run: nix develop --command just ${{ matrix.recipe }}
env:
Expand Down
12 changes: 11 additions & 1 deletion .taplo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Skip vendored, build, and scratch trees (c/moq/build links into target/) so `taplo format` doesn't recurse into them.
exclude = ["**/node_modules/**", "**/target/**", "c/moq/build/**", "**/dist/**", "**/.venv/**", "**/.direnv/**", "**/.tmp/**"]
# `cargo hakari` owns the workspace-hack's formatting; `just rs lint` checks it.
exclude = [
"**/node_modules/**",
"**/target/**",
"c/moq/build/**",
"**/dist/**",
"**/.venv/**",
"**/.direnv/**",
"**/.tmp/**",
"rs/workspace-hack/Cargo.toml",
]

# Match the existing repo style (4-space indent on Cargo.toml, lines up
# to ~120 chars) so the initial format pass stays minimal.
Expand Down
Loading