From a13ba7e1e18cd5961984f6a8135ed7f00f97d6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Sun, 21 Apr 2024 12:15:55 -0700 Subject: [PATCH] Replace deprecated actions-rs/toolchain usage The actions-rs/toolchain GitHub action is no longer maintained. Switch over to using dtolnay/rust-toolchain in its stead. --- .github/workflows/publish.yml | 9 ++------- .github/workflows/test.yml | 26 ++++++-------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0f7f40f..a18a822 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -# Copyright (C) 2023 Daniel Mueller +# Copyright (C) 2023-2024 Daniel Mueller # SPDX-License-Identifier: GPL-3.0-or-later name: Publish @@ -38,12 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: Dry-run package creation run: cargo package --no-verify - name: Create git tag diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be28b62..7ec7ea4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -# Copyright (C) 2022-2023 Daniel Mueller +# Copyright (C) 2022-2024 Daniel Mueller # SPDX-License-Identifier: GPL-3.0-or-later name: Test @@ -38,11 +38,9 @@ jobs: args: --features=test steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} - profile: minimal - override: true - name: Build ${{ matrix.profile }} run: cargo build --profile=${{ matrix.profile }} ${{ matrix.args }} build-minimum: @@ -51,19 +49,14 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Nightly Rust - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly + uses: dtolnay/rust-toolchain@nightly - run: cargo +nightly -Z minimal-versions update - name: Install minimum Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@master with: - profile: minimal # Please adjust README and rust-version field in Cargo.toml files when # bumping version. toolchain: 1.63.0 - default: true - name: Build run: cargo build --locked --all-features test: @@ -84,11 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: clippy - override: true + - uses: dtolnay/rust-toolchain@stable - run: cargo clippy --no-deps --all-targets --all-features -- -A unknown_lints -D warnings cargo-doc: name: Generate documentation @@ -97,10 +86,7 @@ jobs: RUSTDOCFLAGS: '-A unknown_lints -D warnings' steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - run: | cargo doc --no-deps # Explicitly run doc tests as cargo-llvm-cov currently does not.