Merge #95

95: Replace deprecated actions-rs with dtolnay/rust-toolchain r=matthiasbeyer a=matthiasbeyer Co-authored-by: Matthias Beyer <[email protected]>
rust-cli · Mar 3, 2023 · cee87fc · cee87fc
2 parents bf8904e + f42ba65
commit cee87fc
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,10 +23,9 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v3
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          override: true
       - uses: swatinem/rust-cache@v1
       - name: cargo-check
         uses: actions-rs/cargo@v1
@@ -49,10 +48,9 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v3
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          override: true
       - uses: swatinem/rust-cache@v1
       - name: cargo-test
         uses: actions-rs/cargo@v1
@@ -92,28 +90,24 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: 1.60.0
-      - run: rustup component add rustfmt
+          components: rustfmt
       - name: cargo-fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: -- --check
+        run: cargo fmt -- --check
 
 
   clippy:
     name: clippy
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.60.0
-          override: true
+          toolchain: 1.67.0
+          components: clippy
       - uses: swatinem/rust-cache@v1
-      - run: rustup component add clippy
       - name: cargo-clippy
         run: cargo clippy --all --all-targets --all-features