From 888b5084856d2f6c5c3e7e4b0ebce3c2477fc963 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 25 Jan 2023 17:22:26 +0100 Subject: [PATCH] Swap out the deprecated actions-rs/toolchain --- .github/workflows/build.yml | 15 +++++---------- .github/workflows/docs.yml | 10 +++------- .github/workflows/test.yml | 10 ++-------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f4e3a18..b918a9fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,17 +57,12 @@ jobs: key: ${{ matrix.name }}-${{ matrix.cross-target }} - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 + # Needed for SIMD + uses: dtolnay/rust-toolchain@nightly with: - # FIXME: Needed for SIMD. Diopser can be compiled without SIMD support - # though, we'd actually need to test whether both versions - # compile - toolchain: nightly - profile: minimal - default: true - # The macOS AArch64/universal build is done from an x86_64 macOS CI - # runner, so it needs to be cross compiled - target: ${{ matrix.cross-target }} + # The macOS AArch64 build is done from an x86_64 macOS CI runner, so + # it needs to be cross compiled + targets: ${{ matrix.cross-target }} - name: Package all targets from bundler.toml # Instead of hardcoding which targets to build and package, we'll # package everything that's got en entry in the `bundler.toml` file diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index daa5e01a..ebe845b3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -45,13 +45,9 @@ jobs: key: ${{ matrix.name }}-${{ matrix.cross-target }} - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 - with: - # Nightly is needed to document the SIMD feature and for the - # `doc_auto_cfg` feature - toolchain: nightly - profile: minimal - default: true + # Nightly is needed to document the SIMD feature and for the + # `doc_auto_cfg` feature + uses: dtolnay/rust-toolchain@nightly - name: Build all targets uses: actions-rs/cargo@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 314bfe0d..69c4ce54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,14 +50,8 @@ jobs: key: ${{ matrix.name }}-${{ matrix.cross-target }} - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 - with: - # FIXME: Needed for SIMD. Diopser can be compiled without SIMD support - # though, we'd actually need to test whether both versions - # compile - toolchain: nightly - profile: minimal - default: true + # Needed for SIMD + uses: dtolnay/rust-toolchain@nightly - name: Build all targets uses: actions-rs/cargo@v1 with: