From 0a2620164350d8bd88d0ec1d1558c52fd8df4889 Mon Sep 17 00:00:00 2001 From: konsti Date: Tue, 4 Jul 2023 21:22:00 +0200 Subject: [PATCH] Merge clippy and clippy (wasm) jobs on CI (#5447) ## Summary The clippy wasm job rarely fails if regular clippy doesn't, wasm clippy still compiles a lot of native dependencies for the proc macro and we have less CI jobs overall, so i think this an improvement to our CI. ```shell $ CARGO_TARGET_DIR=target-wasm cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -j 2 -- -D warnings $ du -sh target-wasm/* 12K target-wasm/CACHEDIR.TAG 582M target-wasm/debug 268M target-wasm/wasm32-unknown-unknown ``` ## Test plan n/a --- .github/workflows/ci.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7a5543ce0d48..54db12d04d272 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,17 +31,6 @@ jobs: cargo-clippy: name: "cargo clippy" runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: "Install Rust toolchain" - run: | - rustup component add clippy - - uses: Swatinem/rust-cache@v2 - - run: cargo clippy --workspace --all-targets --all-features -- -D warnings - - cargo-clippy-wasm: - name: "cargo clippy (wasm)" - runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: "Install Rust toolchain" @@ -49,7 +38,10 @@ jobs: rustup component add clippy rustup target add wasm32-unknown-unknown - uses: Swatinem/rust-cache@v2 - - run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings + - name: "Clippy" + run: cargo clippy --workspace --all-targets --all-features -- -D warnings + - name: "Clippy (wasm)" + run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings cargo-test: strategy: