From 9932c50c62fb61fea6ca7197df06016d8b4c7a04 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 28 Dec 2022 17:01:24 +0100 Subject: Switch to dtolnay/rust-toolchain Signed-off-by: Matthias Beyer --- .github/workflows/ci.yml | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f862d27..95f23b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,15 +25,12 @@ 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 - with: - command: check + run: cargo check --all-features fmt: @@ -42,15 +39,12 @@ 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 test: @@ -67,16 +61,12 @@ 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 - with: - command: test - args: --all --all-features + run: cargo test --all --all-features clippy: @@ -84,12 +74,11 @@ jobs: 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 + components: clippy - uses: swatinem/rust-cache@v1 - - run: rustup component add clippy - name: cargo-clippy run: cargo clippy --all --all-targets --all-features -- -D warnings -- cgit v1.2.3