Skip to content

Commit 3ae5a29

Browse files
authored
Merge pull request #389 from brendanzab/enable-clippy-on-ci
Check clippy lints on CI
2 parents f507dbf + 89c1f47 commit 3ae5a29

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,25 @@ jobs:
4444
- name: Run cargo fmt
4545
run: nix develop .#${{ matrix.rust-toolchain }} --command cargo fmt
4646

47-
# cargo-clippy:
48-
# runs-on: ubuntu-latest
49-
# strategy:
50-
# matrix:
51-
# rust-toolchain: ["stable"]
52-
# name: Clippy (${{ matrix.rust-toolchain }})
53-
# steps:
54-
# - name: Checkout repository
55-
# uses: actions/checkout@v3
56-
# - name: Install Nix
57-
# uses: cachix/install-nix-action@v17
47+
cargo-clippy:
48+
runs-on: ubuntu-latest
49+
strategy:
50+
matrix:
51+
rust-toolchain: ["stable"]
52+
name: Clippy (${{ matrix.rust-toolchain }})
53+
steps:
54+
- name: Checkout repository
55+
uses: actions/checkout@v3
56+
- name: Install Nix
57+
uses: cachix/install-nix-action@v17
58+
59+
# This is a workaround for https://github.com/oxalica/rust-overlay/issues/54,
60+
# avoiding link errors when running cargo commands with `nix develop`.
61+
- name: Remove binaries installed in ~/.cargo/bin
62+
run: rm --recursive --force --verbose ~/.cargo/bin
5863

59-
# - name: Run cargo clippy
60-
# run: nix develop .#${{ matrix.rust-toolchain }} --command cargo clippy -- --deny warnings
64+
- name: Run cargo clippy
65+
run: nix develop .#${{ matrix.rust-toolchain }} --command cargo clippy -- --deny warnings
6166

6267
nixpkgs-fmt:
6368
runs-on: ubuntu-latest

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
#
9999
# $ nix develop .#minimum --command cargo test
100100
#
101-
pkgs.lib.mapAttrs
101+
lib.mapAttrs
102102
(name: rustToolchain:
103103
let
104104
rustWithExtensions = rustToolchain.override {

0 commit comments

Comments
 (0)