Skip to content

Commit f111f9d

Browse files
committed
Use dtolnay/rust-toolchain to install toolchain in CI
1 parent 2dc7235 commit f111f9d

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,18 @@ jobs:
3636
rust: stable
3737
steps:
3838
- uses: actions/checkout@v3
39-
- name: Install Rust (rustup)
40-
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
41-
shell: bash
42-
- name: Install cargo-hack
43-
uses: taiki-e/install-action@cargo-hack
39+
- uses: dtolnay/rust-toolchain@master
40+
with:
41+
toolchain: ${{ matrix.rust }}
42+
- uses: taiki-e/install-action@cargo-hack
4443
- name: Run tests
4544
run: cargo hack test --feature-powerset && cargo hack test --feature-powerset --release
4645
Rustfmt:
4746
name: Rustfmt
4847
runs-on: ubuntu-latest
4948
steps:
5049
- uses: actions/checkout@v3
51-
- name: Install Rust
52-
run: rustup update stable && rustup default stable && rustup component add rustfmt
50+
- uses: dtolnay/rust-toolchain@stable
5351
- name: Check formatting
5452
run: cargo fmt --all -- --check
5553
Check:
@@ -61,12 +59,10 @@ jobs:
6159
target: ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-netbsd", "x86_64-unknown-redox"]
6260
steps:
6361
- uses: actions/checkout@v3
64-
- name: Install Rust
65-
run: rustup update stable && rustup default stable
66-
- name: Install Target
67-
run: rustup target add ${{ matrix.target }}
68-
- name: Install cargo-hack
69-
uses: taiki-e/install-action@cargo-hack
62+
- uses: dtolnay/rust-toolchain@nightly # NOTE: need nightly for `doc_cfg` feature.
63+
with:
64+
targets: ${{ matrix.target }}
65+
- uses: taiki-e/install-action@cargo-hack
7066
- name: Run check
7167
run: cargo hack check --feature-powerset --all-targets --examples --bins --tests --target ${{ matrix.target }}
7268
- name: Check docs for docs.rs
@@ -76,7 +72,6 @@ jobs:
7672
runs-on: ubuntu-latest
7773
steps:
7874
- uses: actions/checkout@v3
79-
- name: Install Rust
80-
run: rustup update stable && rustup default stable && rustup component add clippy
75+
- uses: dtolnay/rust-toolchain@stable
8176
- name: Run Clippy
8277
run: cargo clippy --all-targets --all-features -- -D warnings

0 commit comments

Comments
 (0)