From 2bc8aa939f77267284d64d6527e75249774f44f6 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Thu, 26 Jun 2025 14:34:18 +0200 Subject: [PATCH] ci(lint): stop linting with nightly --- .github/workflows/ci.yml | 11 ----------- Makefile | 12 +++--------- xtask/src/clippy.rs | 2 +- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6ec9b77..01fb165b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,22 +34,11 @@ jobs: toolchain: stable components: clippy, rustfmt - - name: Set up nightly Rust toolchain - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - components: clippy, rustfmt - - name: Lint files run: | make lint make lint-web - - name: Lint files (Rust nightly) - continue-on-error: true - run: | - make lint-nightly - sanitize: uses: ./.github/workflows/sanitize.yml diff --git a/Makefile b/Makefile index e44af73e..86dfe05b 100644 --- a/Makefile +++ b/Makefile @@ -106,21 +106,15 @@ test-wasm: lint: cargo update --workspace --locked --quiet cargo check --workspace --all-targets - cargo +nightly fmt --all --check - cargo +stable clippy --workspace --all-targets -- -D warnings - -lint-nightly: - cargo update --workspace --locked --quiet - cargo check --workspace --all-targets - cargo +nightly fmt --all --check - cargo +nightly clippy --workspace --all-targets -- -D warnings + cargo fmt --all --check + cargo clippy --workspace --all-targets -- -D warnings lint-web: npm --prefix lib/binding_web ci npm --prefix lib/binding_web run lint format: - cargo +nightly fmt --all + cargo fmt --all changelog: @git-cliff --config .github/cliff.toml --prepend CHANGELOG.md --latest --github-token $(shell gh auth token) diff --git a/xtask/src/clippy.rs b/xtask/src/clippy.rs index c8d33348..664884f5 100644 --- a/xtask/src/clippy.rs +++ b/xtask/src/clippy.rs @@ -6,7 +6,7 @@ use crate::{bail_on_err, Clippy}; pub fn run(args: &Clippy) -> Result<()> { let mut clippy_command = Command::new("cargo"); - clippy_command.arg("+nightly").arg("clippy"); + clippy_command.arg("clippy"); if let Some(package) = args.package.as_ref() { clippy_command.args(["--package", package]);