From 9d33529ae18462fdc634eb7668cbab2c94fe0b7c Mon Sep 17 00:00:00 2001 From: Alexander Gil Date: Mon, 23 Jan 2023 17:25:51 +0100 Subject: [PATCH] fix(ci): Replace `actions-rs/toolchain` with `dtolnay/rust-toolchain` Because node version is going to be deprecated Signed-off-by: Alexander Gil --- .github/workflows/docker_images.yml | 16 ++++++++-------- .github/workflows/pages.yml | 10 +++++----- .github/workflows/rust.yml | 15 +++++---------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docker_images.yml b/.github/workflows/docker_images.yml index 5332fddf..efafe411 100644 --- a/.github/workflows/docker_images.yml +++ b/.github/workflows/docker_images.yml @@ -17,10 +17,10 @@ jobs: - uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + id: toolchain + uses: dtolnay/rust-toolchain@master + + - run: rustup override set ${{steps.toolchain.outputs.name}} - uses: Swatinem/rust-cache@v2 @@ -40,10 +40,10 @@ jobs: - uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + id: toolchain + uses: dtolnay/rust-toolchain@master + + - run: rustup override set ${{steps.toolchain.outputs.name}} - name: Build image run: make images diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 06658ded..446aad3f 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -15,11 +15,11 @@ jobs: - uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - override: true + id: toolchain + uses: dtolnay/rust-toolchain@master + + - run: rustup override set ${{steps.toolchain.outputs.name}} + - run: rustup component add rustfmt - name: Setup mdBook uses: peaceiris/actions-mdbook@v1 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7576796e..3d3a76bf 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,11 +17,10 @@ jobs: uses: actions/checkout@v3 - name: Install fmt with stable toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: stable components: rustfmt - override: true - name: Run cargo fmt run: cargo fmt --all -- --check @@ -34,11 +33,10 @@ jobs: uses: actions/checkout@v3 - name: Install clippy with stable toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: stable components: clippy - override: true - uses: actions-rs/clippy-check@v1 with: @@ -58,12 +56,10 @@ jobs: echo "MIN_SUPPORTED_RUST_VERSION=$(sed -n 's/^rust-version = "\(.*\)"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }}) - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }} - default: true components: clippy - profile: minimal - name: Run clippy (on minimum supported rust version to prevent warnings we can't fix) uses: actions-rs/cargo@v1 @@ -115,11 +111,10 @@ jobs: key: ${{ matrix.job.target }} - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: stable - target: ${{ matrix.job.target }} - override: true + targets: ${{ matrix.job.target }} - name: Run tests uses: actions-rs/cargo@v1