From 93fb15eb09fd8f79650e109c7a7e7f72b2a050c6 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Tue, 23 May 2023 04:07:26 -0700 Subject: [PATCH] Switch CI back to stable clippy (#2108) --- .github/workflows/ci.yaml | 14 +++----------- justfile | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b3bcd2422e..d9eff2f9d1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,25 +49,17 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install rustfmt + - name: Install Rust Toolchain Components uses: actions-rs/toolchain@v1 with: - components: rustfmt + components: clippy, rustfmt override: true toolchain: stable - - name: Install clippy nightly - uses: actions-rs/toolchain@v1 - with: - components: clippy - toolchain: nightly - - uses: Swatinem/rust-cache@v2 - with: - key: "clippy-nightly" - name: Clippy - run: cargo +nightly clippy --all --all-targets + run: cargo clippy --all --all-targets - name: Format run: cargo fmt --all -- --check diff --git a/justfile b/justfile index 01e8292591..0adb27366f 100644 --- a/justfile +++ b/justfile @@ -15,10 +15,10 @@ fmt: cargo fmt clippy: - cargo +nightly clippy --all --all-targets -- -D warnings + cargo clippy --all --all-targets -- -D warnings lclippy: - cargo +nightly lclippy --all --all-targets -- -D warnings + cargo lclippy --all --all-targets -- -D warnings deploy branch chain domain: ssh root@{{domain}} "mkdir -p deploy \