Commit 41e999a
committed
Tooling: move
`apps/desktop/rust-toolchain.toml` was only in scope when rustup/cargo was invoked from inside `apps/desktop/`. That broke for the workspace's other two members (`crates/fsevent-stream`, `crates/index-query`) — they've been silently using whatever default toolchain rustup happened to have installed, not the pinned 1.95.0. And it broke the release workflow yesterday (`db58ff6b`'s build failed because the repo-root `rustup target add x86_64-apple-darwin` step touched a different toolchain than `pnpm tauri build` did inside `apps/desktop/`).
The workspace `Cargo.toml` already lives at the repo root, `target/` already lives at the repo root, and rustup expects the toolchain pin next to the workspace `Cargo.toml`. Moving the file there makes the whole tree see a single, consistent toolchain regardless of which directory you `cd` into.
- `git mv apps/desktop/rust-toolchain.toml ./rust-toolchain.toml`. Comment in the file updated to reflect the new location (no longer needs the "release.yml runs from repo root" footnote).
- `release.yml`: drop the standalone `rustup target add x86_64-apple-darwin` step. The pinned channel now declares both targets, so rustup auto-syncs them the first time it resolves the toolchain. One source of truth.
- `ci.yml` paths-filter: the `rust:` group's only Rust-trigger paths were `apps/desktop/src-tauri/**` and the old `apps/desktop/rust-toolchain.toml`. Broaden to also catch `crates/**`, the workspace `Cargo.toml` / `Cargo.lock`, and the new `rust-toolchain.toml` at root — any of those affect Rust builds and should fire the Rust job.
Verified: `rustup show active-toolchain` resolves to `1.95.0-…(overridden by /Users/.../rust-toolchain.toml)` from the repo root AND from `crates/fsevent-stream/` (which previously got `stable` or whatever the user had).rust-toolchain.toml to the workspace root1 parent 4b99a40 commit 41e999a
3 files changed
Lines changed: 8 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
41 | 44 | | |
42 | 45 | | |
43 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | 45 | | |
50 | 46 | | |
51 | 47 | | |
| |||
Lines changed: 4 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
17 | 16 | | |
0 commit comments