Skip to content

Commit

Permalink
Replace deprecated actions-rs/toolchain usage
Browse files Browse the repository at this point in the history
The actions-rs/toolchain GitHub action is no longer maintained. Switch
over to using dtolnay/rust-toolchain in its stead.
  • Loading branch information
d-e-s-o committed Apr 21, 2024
1 parent 47d1199 commit a13ba7e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 27 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2023 Daniel Mueller <deso@posteo.net>
# Copyright (C) 2023-2024 Daniel Mueller <deso@posteo.net>
# SPDX-License-Identifier: GPL-3.0-or-later

name: Publish
Expand Down Expand Up @@ -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
Expand Down
26 changes: 6 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2022-2023 Daniel Mueller <deso@posteo.net>
# Copyright (C) 2022-2024 Daniel Mueller <deso@posteo.net>
# SPDX-License-Identifier: GPL-3.0-or-later

name: Test
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit a13ba7e

Please sign in to comment.