Commit 60a4ae3
chore(deps): adopt upstream soldr/zccache/setup-soldr updates (#253)
* chore(deps): adopt upstream soldr/zccache/setup-soldr updates
- rust-toolchain.toml: add `profile = "minimal"` (matches soldr/zccache)
- Cargo.toml: bump zccache-artifact 1.4.0 -> 1.8 (API-compatible per semver)
- pyproject.toml: bump zccache>=1.2.13 -> >=1.8.2
- .github/workflows/*.yml (9 files): replace deprecated `target-cache: true`
with `target-cache-profile: thin-v1` (modern setup-soldr input)
- crates/fbuild-build/tests/flag_escaping_lint.rs: extend allowed_files to
cover the post-LOC-split submodule files (methods.rs, build.rs, mod.rs);
the recent board.rs / esp32 orchestrator.rs / stm32 orchestrator.rs
splits moved canonical define code into renamed files but the lint's
allowlist was never updated, breaking the test on main.
`running-process-core` is intentionally NOT bumped: published 3.4.x dropped
the `Containment` enum and `spawn_with_containment` method that fbuild's
git-pinned rev relies on; moving off the pin requires refactoring
fbuild-core::{subprocess,containment} onto `ContainedProcessGroup`. See
#32.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* ci(workflows): revert target-cache-profile -> target-cache: true
The modernized `target-cache-profile: thin-v1` input triggered
`build_cache_mode=once`, which pre-populates the target directory before
`soldr cargo build -p fbuild-cli -p fbuild-daemon` runs. setup-soldr
emits its own warning ("setup-soldr detected a pre-populated shared
target directory; a subsequent `soldr cargo build` using the same
--target-dir may fail with a missing .rmeta error") and the follow-up
build step then fails. ~40 board build jobs regressed on PR #253 because
of this.
The deprecated `target-cache: true` input still works in setup-soldr@v0
and matches the previously-passing main behavior. The deprecation is
just a label — setup-soldr hasn't removed it. Keep using it until we
investigate the correct combination of new inputs that doesn't trip the
shared-target-dir limitation, in a separate task.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* ci(workflows): disable setup-soldr prebuild-deps (workaround upstream regression)
The latest setup-soldr (v0 -> 33e221e via PR #140) defaults
`prebuild-deps: cargo-chef` ON. cargo-chef pre-warms `target/deps/`
before the user's `cargo build`, but on fbuild's CI the prebuild
leaves the shared target directory in a state that conflicts with the
follow-up `soldr cargo build -p fbuild-cli -p fbuild-daemon` step
(missing .rmeta errors). setup-soldr itself emits a warning about
this exact failure mode and exposes `prebuild-deps: none` as the
documented escape hatch.
Apply `prebuild-deps: none` everywhere we invoke setup-soldr (10
workflow files, 11 invocations including bench-205's two blocks).
This is a stop-gap. The proper fix is upstream: either prebuild-deps
should not corrupt the target dir when subsequent `cargo build -p`
calls follow, or fbuild should switch to a separate target-dir for
the daemon/cli build.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent 2f7a132 commit 60a4ae3
16 files changed
Lines changed: 80 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
60 | 61 | | |
61 | 62 | | |
62 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
| 74 | + | |
73 | 75 | | |
74 | 76 | | |
75 | 77 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| 62 | + | |
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
| |||
0 commit comments