From eb234a4d92e7a841576ce08b77806db7d0f1cb9a Mon Sep 17 00:00:00 2001 From: Finesssee Date: Wed, 29 Jul 2026 16:11:41 +0000 Subject: [PATCH 1/3] Fix cargo cache paths and trim unused Rust std targets in PR check Co-authored-by: Codesmith --- .github/workflows/pr-check.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index e4ed5ec3e7..4aa4452b5e 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -32,6 +32,10 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Remove unused preinstalled Rust targets + run: rustup target remove x86_64-pc-windows-gnu i686-pc-windows-msvc + continue-on-error: true + - name: Install Rust uses: dtolnay/rust-toolchain@stable with: @@ -41,9 +45,7 @@ jobs: - name: Cache cargo uses: Swatinem/rust-cache@v2 with: - workspaces: | - rust - apps/desktop-tauri/src-tauri + workspaces: . - name: Setup pnpm uses: pnpm/action-setup@v4 From bc55e98f2bf9ba5ad835d893c1ccebc31a862506 Mon Sep 17 00:00:00 2001 From: Finesssee Date: Wed, 29 Jul 2026 16:15:37 +0000 Subject: [PATCH 2/3] Consolidate PR check cargo steps to workspace-level invocations Co-authored-by: Codesmith --- .github/workflows/pr-check.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 4aa4452b5e..917375dfbc 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -65,17 +65,11 @@ jobs: - name: Rust format check run: cargo fmt --all --check - - name: Shared Rust clippy - run: cargo clippy --manifest-path rust/Cargo.toml --all-targets -- -D warnings + - name: Rust clippy (workspace) + run: cargo clippy --workspace --all-targets -- -D warnings - - name: Tauri Rust clippy - run: cargo clippy --manifest-path apps/desktop-tauri/src-tauri/Cargo.toml --all-targets -- -D warnings - - - name: Shared Rust tests - run: cargo test --manifest-path rust/Cargo.toml - - - name: Tauri Rust tests - run: cargo test --manifest-path apps/desktop-tauri/src-tauri/Cargo.toml + - name: Rust tests (workspace) + run: cargo test --workspace - name: Frontend tests run: pnpm --dir apps/desktop-tauri test From 2bfb4359e594108e2b01804f716955cc972fe6c4 Mon Sep 17 00:00:00 2001 From: Finesssee Date: Wed, 29 Jul 2026 17:16:17 +0000 Subject: [PATCH 3/3] Address review: default rust-cache workspace, comment target removal, sync CI.md Co-authored-by: Codesmith --- .github/CI.md | 6 ++---- .github/workflows/pr-check.yml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/CI.md b/.github/CI.md index a5b6401b7e..7f84e43ae9 100644 --- a/.github/CI.md +++ b/.github/CI.md @@ -16,10 +16,8 @@ Exact commands run, in order: ```powershell cargo fmt --all --check -cargo clippy --manifest-path rust/Cargo.toml --all-targets -- -D warnings -cargo clippy --manifest-path apps/desktop-tauri/src-tauri/Cargo.toml --all-targets -- -D warnings -cargo test --manifest-path rust/Cargo.toml -cargo test --manifest-path apps/desktop-tauri/src-tauri/Cargo.toml +cargo clippy --workspace --all-targets -- -D warnings +cargo test --workspace pnpm --dir apps/desktop-tauri test pnpm --dir apps/desktop-tauri run build ``` diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 917375dfbc..038c35eba8 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -32,6 +32,8 @@ jobs: steps: - uses: actions/checkout@v4 + # The runner image preinstalls these std targets; dropping them before the + # stable sync avoids re-downloading rust-std for targets CI never builds. - name: Remove unused preinstalled Rust targets run: rustup target remove x86_64-pc-windows-gnu i686-pc-windows-msvc continue-on-error: true @@ -44,8 +46,6 @@ jobs: - name: Cache cargo uses: Swatinem/rust-cache@v2 - with: - workspaces: . - name: Setup pnpm uses: pnpm/action-setup@v4