fix: Streamline linting logic

Nukesor · May 20, 2024 · c2def71 · c2def71
1 parent 4805fc7
commit c2def71
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -72,8 +72,16 @@ jobs:
             lint-${{ runner.os }}-cargo-${{ matrix.target }}-
             ${{ runner.os }}-cargo-${{ matrix.target }}-
 
+      - name: Cargo sort
+        run: cargo install cargo-sort
+
+      # ----- Actual linting logic ------
+      # These lines should mirror the `just lint` command.
       - name: cargo fmt
-        run : cargo fmt --all -- --check
+        run: cargo fmt --all -- --check
+
+      - name: cargo sort
+        run: sort --workspace --check
 
       - name: cargo clippy
         run: cargo clippy --tests --workspace -- -D warnings
diff --git a/Justfile b/Justfile
@@ -12,9 +12,9 @@ nextest:
 
 lint:
     just ensure_installed sort
-    cargo fmt --check
+    cargo fmt --all -- --check
     cargo sort --workspace --check
-    cargo clippy --all --tests
+    cargo clippy --tests --workspace -- -D warnings
 
 format:
     just ensure_installed sort