From 96143c14bca5168f3981ee5bf4b6be3c79a2b9ec Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Tue, 4 Nov 2025 17:13:28 +0800 Subject: [PATCH 1/3] run clippy as part of rust cache --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b38b8bf28c..5258cc1678 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -270,3 +270,9 @@ jobs: - name: Build release run: cargo check --all --release + + - name: Run Clippy + if: ${{ matrix.settings.target == 'aarch64-apple-darwin' }} + uses: actions-rs-plus/clippy-check@v2 + with: + args: --workspace --all-features --locked From f03a31a129fbc0788b3911621ff7f309e36cde4e Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Tue, 4 Nov 2025 17:16:38 +0800 Subject: [PATCH 2/3] don't bother building desktop if no desktop changes --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5258cc1678..76cab5b59f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: build-desktop: name: Build Desktop needs: changes - if: needs.changes.outputs.rust == 'true' || needs.changes.outputs.desktop == 'true' + if: needs.changes.outputs.desktop == 'true' strategy: fail-fast: false matrix: From 788c5be34a0e68c2cc11e96dcf1b1adad6b1ff1b Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Tue, 4 Nov 2025 17:18:05 +0800 Subject: [PATCH 3/3] run clippy on windows too --- .github/workflows/ci.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76cab5b59f..ed79cdde44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,10 +98,16 @@ jobs: runs-on: macos-latest needs: changes if: needs.changes.outputs.rust == 'true' + strategy: + fail-fast: false + matrix: + settings: + - target: aarch64-apple-darwin + runner: macos-latest + - target: x86_64-pc-windows-msvc + runner: windows-latest permissions: contents: read - env: - target: aarch64-apple-darwin steps: - name: Checkout repository uses: actions/checkout@v4 @@ -109,12 +115,12 @@ jobs: - name: Rust setup uses: dtolnay/rust-toolchain@stable with: - targets: ${{ env.target }} + targets: ${{ matrix.settings.target }} components: clippy - uses: ./.github/actions/setup-rust-cache with: - target: ${{ env.target }} + target: ${{ matrix.settings.target }} - name: Create .env file in root run: | @@ -272,7 +278,7 @@ jobs: run: cargo check --all --release - name: Run Clippy - if: ${{ matrix.settings.target == 'aarch64-apple-darwin' }} + if: ${{ matrix.settings.target == 'aarch64-apple-darwin' || matrix.settings.target == 'x86_64-pc-windows-msvc' }} uses: actions-rs-plus/clippy-check@v2 with: args: --workspace --all-features --locked