From 1132d6a380639a57c446c12bf76a0cf8e4eb59ba Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Sun, 2 Jul 2023 15:09:54 -0400 Subject: [PATCH] Pin Clippy to nightly-2023-06-28 Until the following is resolved: https://github.com/rust-lang/rust/pull/112628#issuecomment-1616750719 --- .github/workflows/ci.yml | 4 ++++ necessist/tests/ci.rs | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d8b0855..92a7d327 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,10 @@ jobs: cargo install cargo-license || true cargo install cargo-modules || true cargo install cargo-sort || true + # smoelius: Pin Clippy to nightly-2023-06-28 until the following is resolved: + # https://github.com/rust-lang/rust/pull/112628#issuecomment-1616750719 + rustup toolchain install nightly-2023-06-28 + rustup +nightly-2023-06-28 component add clippy - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 diff --git a/necessist/tests/ci.rs b/necessist/tests/ci.rs index d8e2d614..f21156d0 100644 --- a/necessist/tests/ci.rs +++ b/necessist/tests/ci.rs @@ -279,9 +279,16 @@ fn update() { fn clippy_command(cargo_args: &[&str], rustc_args: &[&str]) -> Command { // smoelius: The next command should match what's in scripts/clippy.sh. + // smoelius: Pin Clippy to nightly-2023-06-28 until the following is resolved: + // https://github.com/rust-lang/rust/pull/112628#issuecomment-1616750719 let mut command = Command::new("cargo"); command - .args(["+nightly", "clippy", "--all-features", "--all-targets"]) + .args([ + "+nightly-2023-06-28", + "clippy", + "--all-features", + "--all-targets", + ]) .args(cargo_args) .args(["--"]) .args(rustc_args)