Skip to content

Commit 8c9bfbb

Browse files
committed
Prefer dtolnay/rust-toolchain in CI and simplify
1 parent b247628 commit 8c9bfbb

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

.github/workflows/ci.yaml

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ jobs:
2929
RUSTFLAGS: -Dwarnings
3030
RUSTDOCFLAGS: -Dwarnings
3131
steps:
32-
- name: Checkout
33-
uses: actions/checkout@v4
34-
- name: Install Rust stable
35-
run: |
36-
rustup update --no-self-update stable
37-
rustup default stable
32+
- uses: actions/checkout@v4
33+
- uses: dtolnay/rust-toolchain@stable
34+
with:
35+
components: rustfmt, clippy
3836
- run: cargo fmt --all -- --check
3937
- name: Cache dependencies
4038
uses: Swatinem/rust-cache@v2
@@ -63,8 +61,7 @@ jobs:
6361
name: Test ${{ matrix.rust }} on ${{ matrix.platform || matrix.os }}
6462
runs-on: ${{ matrix.os }}
6563
steps:
66-
- name: Checkout
67-
uses: actions/checkout@v4
64+
- uses: actions/checkout@v4
6865
- name: Install MinGW
6966
if: matrix.platform == 'i686-pc-windows-gnu'
7067
# See: https://github.com/egor-tensin/setup-mingw/issues/17
@@ -117,16 +114,12 @@ jobs:
117114
name: Test QEMU ${{ matrix.platform }}
118115
runs-on: ubuntu-latest
119116
steps:
120-
- name: Checkout
121-
uses: actions/checkout@v4
122-
- name: Install Nix
123-
uses: cachix/install-nix-action@v31
117+
- uses: actions/checkout@v4
118+
- uses: cachix/install-nix-action@v31
124119
with:
125120
github_access_token: ${{ secrets.GITHUB_TOKEN }}
126121
- name: Prepare devShell
127122
run: nix develop --command true
128-
- name: Prepare devShell
129-
run: nix develop --command true
130123

131124
- name: Disable dev-dependencies and set target
132125
run: |
@@ -157,15 +150,9 @@ jobs:
157150
timeout-minutes: 15
158151
if: github.event.schedule != '33 20 * * *'
159152
steps:
160-
- name: Checkout
161-
uses: actions/checkout@v4
162-
- name: Install Rust 1.87
163-
run: |
164-
rustup update --no-self-update stable
165-
rustup default 1.87
166-
- name: Cache dependencies
167-
uses: Swatinem/rust-cache@v2
168-
153+
- uses: actions/checkout@v4
154+
- uses: dtolnay/rust-toolchain@1.87
155+
- uses: Swatinem/rust-cache@v2
169156
- name: Test
170157
run: |
171158
for flags in {,--features=unwind}' '{,'--release -- --include-ignored'}; do

0 commit comments

Comments
 (0)