Merge pull request #883 from foresterre/actions

foresterre · Sep 25, 2023 · be16c4a · be16c4a
2 parents a36c96c + f52b443
commit be16c4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -7,30 +7,23 @@ on:
       - main
       - staging # for Bors
       - trying # for Bors
+  merge_group:
 jobs:
   linter:
+    name: linter
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
       - name: checkout_repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install_rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
-          profile: minimal
           components: clippy
 
       - name: check_with_clippy_backend_pixels
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets --no-default-features --features backend_pixels -- -D warnings
+        run: cargo clippy --all-targets --no-default-features --features backend_pixels -- -D warnings
 
       - name: check_with_clippy_backend_piston_window
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets --no-default-features --features backend_piston_window -- -D warnings
+        run: cargo clippy --all-targets --no-default-features --features backend_piston_window -- -D warnings
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,23 +25,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [stable, beta, nightly, win-gnu, win-msvc]
+        build: [stable, win-gnu, win-msvc]
         include:
           # latest rust stable :: ubuntu
           - build: stable
             os: ubuntu-latest
             rust: stable
 
-          # latest rust beta :: ubuntu
-          - build: beta
-            os: ubuntu-latest
-            rust: beta
-
-          # latest rust nightly :: ubuntu
-          - build: nightly
-            os: ubuntu-latest
-            rust: nightly
-
           # latest rust stable :: windows + gnu
           - build: win-gnu
             os: windows-latest

diff --git a/tests/cli.rs b/tests/cli.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::items_after_test_module)]
+
 use assert_cmd::Command;
 use common::input;
 use parameterized::{ide, parameterized};