Skip to content

Commit 362696a

Browse files
committed
Move to maintained rust installer
See actions-rs/toolchain#216
1 parent d6bd5c6 commit 362696a

File tree

5 files changed

+23
-63
lines changed

5 files changed

+23
-63
lines changed

.github/workflows/check.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ jobs:
1212
with:
1313
submodules: true
1414
- name: Install stable
15-
uses: actions-rs/toolchain@v1
15+
uses: dtolnay/rust-toolchain@stable
1616
with:
17-
profile: minimal
18-
toolchain: stable
1917
components: rustfmt
2018
- name: cargo fmt --check
2119
uses: actions-rs/cargo@v1
@@ -34,11 +32,9 @@ jobs:
3432
with:
3533
submodules: true
3634
- name: Install ${{ matrix.toolchain }}
37-
uses: actions-rs/toolchain@v1
35+
uses: dtolnay/rust-toolchain@master
3836
with:
39-
profile: minimal
4037
toolchain: ${{ matrix.toolchain }}
41-
default: true
4238
components: clippy
4339
- name: cargo clippy
4440
uses: actions-rs/clippy-check@v1
@@ -52,11 +48,7 @@ jobs:
5248
with:
5349
submodules: true
5450
- name: Install nightly
55-
uses: actions-rs/toolchain@v1
56-
with:
57-
profile: minimal
58-
toolchain: nightly
59-
default: true
51+
uses: dtolnay/rust-toolchain@nightly
6052
- name: cargo doc
6153
uses: actions-rs/cargo@v1
6254
with:
@@ -72,10 +64,7 @@ jobs:
7264
with:
7365
submodules: true
7466
- name: Install stable
75-
uses: actions-rs/toolchain@v1
76-
with:
77-
profile: minimal
78-
toolchain: stable
67+
uses: dtolnay/rust-toolchain@stable
7968
- name: cargo install cargo-hack
8069
uses: taiki-e/install-action@cargo-hack
8170
- name: cargo hack
@@ -96,11 +85,9 @@ jobs:
9685
with:
9786
submodules: true
9887
- name: Install ${{ matrix.toolchain }}
99-
uses: actions-rs/toolchain@v1
88+
uses: dtolnay/rust-toolchain@master
10089
with:
101-
profile: minimal
10290
toolchain: ${{ matrix.msrv }}
103-
default: true
10491
- name: cargo +${{ matrix.msrv }} check
10592
uses: actions-rs/cargo@v1
10693
with:

.github/workflows/nostd.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ jobs:
1111
matrix:
1212
target: [thumbv7m-none-eabi, aarch64-unknown-none]
1313
steps:
14-
- uses: actions-rs/toolchain@v1
15-
with:
16-
profile: minimal
17-
toolchain: stable
18-
target: ${{ matrix.target }}
1914
- uses: actions/checkout@v3
15+
with:
16+
submodules: true
17+
- name: Install stable
18+
uses: dtolnay/rust-toolchain@stable
19+
- name: rustup target add ${{ matrix.target }}
20+
run: rustup target add ${{ matrix.target }}
2021
- name: cargo check
2122
uses: actions-rs/cargo@v1
2223
with:

.github/workflows/safety.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ jobs:
1111
with:
1212
submodules: true
1313
- name: Install nightly
14-
uses: actions-rs/toolchain@v1
15-
with:
16-
profile: minimal
17-
toolchain: nightly
18-
default: true
14+
uses: dtolnay/rust-toolchain@nightly
1915
- run: |
2016
# to get the symbolizer for debug symbol resolution
2117
sudo apt install llvm
@@ -52,11 +48,9 @@ jobs:
5248
- run: |
5349
echo "NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)" >> $GITHUB_ENV
5450
- name: Install ${{ env.NIGHTLY }}
55-
uses: actions-rs/toolchain@v1
51+
uses: dtolnay/rust-toolchain@master
5652
with:
57-
profile: minimal
5853
toolchain: ${{ env.NIGHTLY }}
59-
default: true
6054
components: miri
6155
- name: cargo miri test
6256
uses: actions-rs/cargo@v1
@@ -72,10 +66,7 @@ jobs:
7266
with:
7367
submodules: true
7468
- name: Install stable
75-
uses: actions-rs/toolchain@v1
76-
with:
77-
toolchain: stable
78-
profile: minimal
69+
uses: dtolnay/rust-toolchain@stable
7970
- name: cargo test --test loom
8071
uses: actions-rs/cargo@v1
8172
with:

.github/workflows/scheduled.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ jobs:
1515
with:
1616
submodules: true
1717
- name: Install nightly
18-
uses: actions-rs/toolchain@v1
19-
with:
20-
profile: minimal
21-
toolchain: nightly
22-
default: true
18+
uses: dtolnay/rust-toolchain@nightly
2319
- name: cargo generate-lockfile
2420
if: hashFiles('Cargo.lock') == ''
2521
uses: actions-rs/cargo@v1
@@ -44,11 +40,7 @@ jobs:
4440
submodules: true
4541
- name: Install beta
4642
if: hashFiles('Cargo.lock') != ''
47-
uses: actions-rs/toolchain@v1
48-
with:
49-
profile: minimal
50-
toolchain: beta
51-
default: true
43+
uses: dtolnay/rust-toolchain@beta
5244
- name: cargo update
5345
if: hashFiles('Cargo.lock') != ''
5446
uses: actions-rs/cargo@v1

.github/workflows/test.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ jobs:
1515
with:
1616
submodules: true
1717
- name: Install ${{ matrix.toolchain }}
18-
uses: actions-rs/toolchain@v1
18+
uses: dtolnay/rust-toolchain@master
1919
with:
20-
profile: minimal
2120
toolchain: ${{ matrix.toolchain }}
22-
default: true
2321
- name: cargo generate-lockfile
2422
if: hashFiles('Cargo.lock') == ''
2523
uses: actions-rs/cargo@v1
@@ -39,15 +37,11 @@ jobs:
3937
with:
4038
submodules: true
4139
- name: Install stable
42-
uses: actions-rs/toolchain@v1
43-
with:
44-
profile: minimal
45-
toolchain: stable
40+
uses: dtolnay/rust-toolchain@stable
4641
- name: Install nightly for -Zminimal-versions
47-
uses: actions-rs/toolchain@v1
48-
with:
49-
profile: minimal
50-
toolchain: nightly
42+
uses: dtolnay/rust-toolchain@nightly
43+
- name: rustup default stable
44+
run: rustup default stable
5145
- name: cargo update -Zminimal-versions
5246
uses: actions-rs/cargo@v1
5347
with:
@@ -71,10 +65,7 @@ jobs:
7165
with:
7266
submodules: true
7367
- name: Install stable
74-
uses: actions-rs/toolchain@v1
75-
with:
76-
profile: minimal
77-
toolchain: stable
68+
uses: dtolnay/rust-toolchain@stable
7869
- name: cargo generate-lockfile
7970
if: hashFiles('Cargo.lock') == ''
8071
uses: actions-rs/cargo@v1
@@ -93,10 +84,8 @@ jobs:
9384
with:
9485
submodules: true
9586
- name: Install stable
96-
uses: actions-rs/toolchain@v1
87+
uses: dtolnay/rust-toolchain@stable
9788
with:
98-
profile: minimal
99-
toolchain: stable
10089
components: llvm-tools-preview
10190
- name: cargo install cargo-llvm-cov
10291
uses: taiki-e/install-action@cargo-llvm-cov

0 commit comments

Comments
 (0)