From 9bcb257985d5a16355bdd62998935f16d09b42e2 Mon Sep 17 00:00:00 2001 From: Cameron Steffen Date: Fri, 12 Feb 2021 16:34:42 -0600 Subject: [PATCH 1/2] Add workspace to manifest --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index ea32a8edd1ff..b996e55c7795 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,9 @@ build = "build.rs" edition = "2018" publish = false +[workspace] +exclude = ["clippy_dev", "mini-macro"] + [[bin]] name = "cargo-clippy" test = false From e355652fec704f307b50d42fb6a08172dc1e08bf Mon Sep 17 00:00:00 2001 From: Cameron Steffen Date: Tue, 16 Feb 2021 10:39:24 -0600 Subject: [PATCH 2/2] Test workspace at once --- .github/workflows/clippy.yml | 12 ++---------- .github/workflows/clippy_bors.yml | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 9d5e12aac5f7..f6ac936df4d6 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -53,16 +53,8 @@ jobs: - name: Test "--fix -Zunstable-options" run: cargo run --features deny-warnings,internal-lints --bin cargo-clippy -- clippy --fix -Zunstable-options - - name: Test - run: cargo test --features deny-warnings,internal-lints - - - name: Test clippy_lints - run: cargo test --features deny-warnings,internal-lints - working-directory: clippy_lints - - - name: Test rustc_tools_util - run: cargo test --features deny-warnings - working-directory: rustc_tools_util + - name: Test Workspace + run: cargo test --all --features deny-warnings,internal-lints - name: Test clippy_dev run: cargo test --features deny-warnings diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 5d846eb64c78..9d24b0293c4a 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -112,16 +112,8 @@ jobs: - name: Build run: cargo build --features deny-warnings,internal-lints - - name: Test - run: cargo test --features deny-warnings,internal-lints - - - name: Test clippy_lints - run: cargo test --features deny-warnings,internal-lints - working-directory: clippy_lints - - - name: Test rustc_tools_util - run: cargo test --features deny-warnings - working-directory: rustc_tools_util + - name: Test Workspace + run: cargo test --all --features deny-warnings,internal-lints - name: Test clippy_dev run: cargo test --features deny-warnings