diff --git a/Cargo.lock b/Cargo.lock index 2c06015d9..1e4643f8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2279,9 +2279,9 @@ dependencies = [ [[package]] name = "kernal-api" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54844116729c2a5c64d5b313d79f839323c044cc01867f7e2bf0f192ac9e6903" +checksum = "f18d3cbb9bd8f6a590cf9b5a75297c542786fcef93bb3ff7245eb8f8b1b09561" dependencies = [ "blake3", "crash-handler", @@ -3422,9 +3422,9 @@ dependencies = [ [[package]] name = "running-process" -version = "4.10.14" +version = "4.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f0ff903e7b61396a074648fc6301668492de90aea4b5d09cc914eee9389e9b" +checksum = "c040ca81d60235a6027ef3115629049829464758e1011500902c8a2355727812" dependencies = [ "anyhow", "blake3", @@ -3453,14 +3453,15 @@ dependencies = [ [[package]] name = "running-process-platform-internal" -version = "4.10.14" +version = "4.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e5db04a966dfead09ff660b704c2461a05e8477249b8f10532b41a22219348" +checksum = "0ef39418f8c71399ea811c5daba36f2325516cc02c3b2169473400411941ed5f" dependencies = [ "blake3", "dirs", "interprocess", "libc", + "miniz_oxide", "sysinfo", "thiserror 2.0.20", "tokio", @@ -3471,9 +3472,9 @@ dependencies = [ [[package]] name = "running-process-probe" -version = "4.10.14" +version = "4.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a44810a8ff3d44214a02b2de688a8004cd35fe66c585cde273770d49860a68" +checksum = "68d60cba7103c84759e85cd98778c44090d01627b1eebbf79c72270c32f772b7" dependencies = [ "crash-handler", "framehop", @@ -3484,6 +3485,7 @@ dependencies = [ "prost", "prost-build", "protox", + "running-process-platform-internal", "thiserror 2.0.20", "winapi", "windows-sys 0.61.2", @@ -3491,9 +3493,9 @@ dependencies = [ [[package]] name = "running-process-probe-daemon" -version = "4.10.14" +version = "4.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6276bcbbdb64c0db39e087c2f24fcd02916038550f362bef8a1798506048500d" +checksum = "1de6766e359cc87de9d22acfee67defd759172c8dfddd6b40c9257e5e3d359b8" dependencies = [ "axum 0.8.9", "blake3", @@ -3510,6 +3512,7 @@ dependencies = [ "protox", "regex", "running-process", + "running-process-platform-internal", "running-process-probe", "rusqlite", "serde", @@ -3526,9 +3529,9 @@ dependencies = [ [[package]] name = "running-process-protocol" -version = "4.10.14" +version = "4.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32daa00db0c79106d3181f1e306efe92a59bd1b0429440bdc5e6debf3cc4345" +checksum = "c51894dfa970ac24213066f37b33656fd92c7053ef3e94f184b70000d8cf48f7" dependencies = [ "prost", "prost-build", @@ -5082,8 +5085,8 @@ dependencies = [ [[package]] name = "zccache" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "arc-swap", "bincode", @@ -5123,8 +5126,8 @@ dependencies = [ [[package]] name = "zccache-artifact" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "bincode", "dashmap", @@ -5142,8 +5145,8 @@ dependencies = [ [[package]] name = "zccache-audit" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "serde", "serde_json", @@ -5152,16 +5155,16 @@ dependencies = [ [[package]] name = "zccache-compile-trace" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "zccache-audit", ] [[package]] name = "zccache-compiler" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "clang", "kernal-api", @@ -5174,8 +5177,8 @@ dependencies = [ [[package]] name = "zccache-core" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "kernal-api", "serde", @@ -5186,8 +5189,8 @@ dependencies = [ [[package]] name = "zccache-daemon-core" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "arc-swap", "bincode", @@ -5195,6 +5198,7 @@ dependencies = [ "clang", "dashmap", "kernal-api", + "memchr", "prost", "rayon", "regex", @@ -5222,8 +5226,8 @@ dependencies = [ [[package]] name = "zccache-depgraph" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "bincode", "dashmap", @@ -5242,8 +5246,8 @@ dependencies = [ [[package]] name = "zccache-fingerprint" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "kernal-api", "rayon", @@ -5251,14 +5255,15 @@ dependencies = [ "serde_json", "thiserror 2.0.20", "tracing", + "twox-hash", "zccache-core", "zccache-hash", ] [[package]] name = "zccache-fscache" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "bincode", "dashmap", @@ -5272,8 +5277,8 @@ dependencies = [ [[package]] name = "zccache-hash" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "kernal-api", "serde", @@ -5281,8 +5286,8 @@ dependencies = [ [[package]] name = "zccache-ipc" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "bytes", "dashmap", @@ -5299,8 +5304,8 @@ dependencies = [ [[package]] name = "zccache-protocol" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "bytes", "kernal-api", @@ -5315,8 +5320,8 @@ dependencies = [ [[package]] name = "zccache-watcher" -version = "1.14.14" -source = "git+https://github.com/zackees/zccache?rev=b385a7bfb308c2d1456613622ad361eb66d31cdd#b385a7bfb308c2d1456613622ad361eb66d31cdd" +version = "1.15.6" +source = "git+https://github.com/zackees/zccache?rev=15ec9537af0d219e07b72ce2b3f97d5f68d72b5e#15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" dependencies = [ "kernal-api", "rayon", diff --git a/Cargo.toml b/Cargo.toml index cd0791fcd..247451989 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -156,7 +156,7 @@ mimalloc-pprof = "0.9" # something the shipped daemon links. The version MUST equal the # `running-process` rev pinned above, for the same `rp_*_public` # symbol-duplication reason documented there. -running-process-probe-daemon = "=4.10.14" +running-process-probe-daemon = "=4.10.16" object = { version = "0.36", default-features = false, features = ["read", "std", "elf", "write"] } rusqlite = { version = "0.32", features = ["bundled"] } shell-words = "1" @@ -196,13 +196,13 @@ owo-colors = "4" # loopback-HTTP path (see crates/fbuild-daemon/src/broker). # # Source must match zccache's `running-process` pin exactly (same source and -# version, not just the same semver; zccache takes =4.10.14 from crates.io). `running-process` exports unmangled `rp_*_public` C +# version, not just the same semver; zccache takes =4.10.16 from crates.io). `running-process` exports unmangled `rp_*_public` C # symbols; Cargo treats a registry package and a git package as two distinct # packages, so a registry pin here plus zccache's git pin puts BOTH copies in # the link and every one of those symbols collides (`rust-lld: error: # duplicate symbol: rp_native_process_start_public`, …). Keep this pin in # lockstep with zccache's resolved `running-process` when repinning zccache. -running-process = { version = "=4.10.14", default-features = false, features = ["client-async"] } +running-process = { version = "=4.10.16", default-features = false, features = ["client-async"] } [profile.dev] debug = "line-tables-only" diff --git a/crates/fbuild-build-arm/Cargo.toml b/crates/fbuild-build-arm/Cargo.toml index 57af300f9..081df5eff 100644 --- a/crates/fbuild-build-arm/Cargo.toml +++ b/crates/fbuild-build-arm/Cargo.toml @@ -34,7 +34,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" } +zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build-engine/Cargo.toml b/crates/fbuild-build-engine/Cargo.toml index be590276d..1620c7dd8 100644 --- a/crates/fbuild-build-engine/Cargo.toml +++ b/crates/fbuild-build-engine/Cargo.toml @@ -35,7 +35,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" } +zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build-esp/Cargo.toml b/crates/fbuild-build-esp/Cargo.toml index b4a434491..4952cad02 100644 --- a/crates/fbuild-build-esp/Cargo.toml +++ b/crates/fbuild-build-esp/Cargo.toml @@ -35,7 +35,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" } +zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build-mcu/Cargo.toml b/crates/fbuild-build-mcu/Cargo.toml index 6523f35be..6dfbc1a3c 100644 --- a/crates/fbuild-build-mcu/Cargo.toml +++ b/crates/fbuild-build-mcu/Cargo.toml @@ -34,7 +34,7 @@ tar = { workspace = true } zip = { workspace = true } tree-sitter = { workspace = true } tree-sitter-cpp = { workspace = true } -zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" } +zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" } [dev-dependencies] filetime = { workspace = true } diff --git a/crates/fbuild-build/Cargo.toml b/crates/fbuild-build/Cargo.toml index 9c98b969f..af445efd5 100644 --- a/crates/fbuild-build/Cargo.toml +++ b/crates/fbuild-build/Cargo.toml @@ -52,13 +52,13 @@ tree-sitter-cpp = { workspace = true } # work: #1768's heartbeat-free compile requests, #1770's mtime-floor skip on # C/C++ hits, #1761/#1763's dropped durability syncs, #1775 unchanged-state # shutdown skip), which takes -# running-process =4.10.14 from crates.io. Keep both pins aligned when +# running-process =4.10.16 from crates.io. Keep both pins aligned when # repinning so fbuild links exactly one copy of the exported broker symbols. # # `running-process` in the workspace root must be pinned to the SAME source # and version zccache uses, or its unmangled `rp_*_public` C symbols get # linked twice (guarded by crates/fbuild-core/tests/dep_identity.rs). -zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" } +zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" } [dev-dependencies] filetime = { workspace = true }