From 3cb798c5185e706292114caf62524022eb4022fc Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Tue, 14 Mar 2023 03:32:46 +0000 Subject: [PATCH] use actions-rust-lang/setup-rust-toolchain in CI --- .github/workflows/clippy-fmt.yml | 20 +++++++++++--------- .github/workflows/linux.yml | 10 +++------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/clippy-fmt.yml b/.github/workflows/clippy-fmt.yml index 96c9047f..a1122fd3 100644 --- a/.github/workflows/clippy-fmt.yml +++ b/.github/workflows/clippy-fmt.yml @@ -12,11 +12,14 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - with: { components: rustfmt } + - name: Install Rust + uses: actions-rust-lang/setup-rust-toolchain@v1.4.3 + with: + toolchain: stable + components: rustfmt - name: rustfmt - run: cargo fmt --all -- --check + uses: actions-rust-lang/rustfmt@v1 clippy: name: clippy check @@ -25,16 +28,15 @@ jobs: env: CI: 1 CARGO_INCREMENTAL: false - CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - with: { components: clippy } - - - name: Cache Dependencies - uses: Swatinem/rust-cache@v2.2.1 + - name: Install Rust + uses: actions-rust-lang/setup-rust-toolchain@v1.4.3 + with: + toolchain: stable + components: clippy # - name: Create test DBs # run: | diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4ea9ad4d..364dc4fc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -19,18 +19,14 @@ jobs: env: CI: 1 CARGO_INCREMENTAL: false - CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse steps: - uses: actions/checkout@v3 - name: Install Rust - run: | - rustup install ${{ matrix.version }} --no-self-update --profile minimal --force - rustup override set ${{ matrix.version }} - - - name: Cache Dependencies - uses: Swatinem/rust-cache@v2.2.1 + uses: actions-rust-lang/setup-rust-toolchain@v1.4.3 + with: + toolchain: ${{ matrix.version }} - name: Install DB CLI tools run: |