Skip to content

Commit dd5bec7

Browse files
authored
Merge pull request #488 from madsmtm/update-rust-toolchain-installer
Use `dtolnay/rust-toolchain` instead of `actions-rs/toolchain`
2 parents 00fdc91 + e976d99 commit dd5bec7

File tree

1 file changed

+12
-28
lines changed

1 file changed

+12
-28
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,11 @@ jobs:
132132
submodules: true
133133

134134
- name: Install Rust toolchain
135-
uses: actions-rs/toolchain@v1
135+
uses: dtolnay/rust-toolchain@master
136136
with:
137137
toolchain: ${{ env.CURRENT_NIGHTLY }}
138-
profile: minimal
139-
override: true
140138
components: clippy ${{ matrix.build-std && ', rust-src' || '' }}
141-
target: ${{ (!matrix.build-std) && matrix.target || null }}
139+
targets: ${{ (!matrix.build-std) && matrix.target || null }}
142140

143141
- name: Cache Cargo
144142
uses: actions/cache@v3
@@ -165,12 +163,10 @@ jobs:
165163
submodules: true
166164

167165
- name: Install Rust toolchain
168-
uses: actions-rs/toolchain@v1
166+
uses: dtolnay/rust-toolchain@master
169167
with:
170168
toolchain: '1.60'
171-
profile: minimal
172-
override: true
173-
target: x86_64-apple-darwin
169+
targets: x86_64-apple-darwin
174170

175171
- name: Cache Cargo
176172
uses: actions/cache@v3
@@ -198,11 +194,9 @@ jobs:
198194
submodules: true
199195

200196
- name: Install Rust toolchain
201-
uses: actions-rs/toolchain@v1
197+
uses: dtolnay/rust-toolchain@master
202198
with:
203199
toolchain: ${{ env.CURRENT_NIGHTLY }}
204-
profile: minimal
205-
override: true
206200
components: rust-src
207201

208202
- name: Cache Cargo
@@ -227,11 +221,9 @@ jobs:
227221
submodules: true
228222

229223
- name: Install Rust toolchain
230-
uses: actions-rs/toolchain@v1
224+
uses: dtolnay/rust-toolchain@master
231225
with:
232226
toolchain: ${{ env.CURRENT_NIGHTLY }}
233-
profile: minimal
234-
override: true
235227
components: rust-src
236228

237229
- name: Install remaining targets
@@ -334,11 +326,9 @@ jobs:
334326
submodules: true
335327

336328
- name: Install Rust toolchain
337-
uses: actions-rs/toolchain@v1
329+
uses: dtolnay/rust-toolchain@master
338330
with:
339331
toolchain: stable
340-
profile: minimal
341-
override: true
342332

343333
- name: Cache Cargo
344334
uses: actions/cache@v3
@@ -424,11 +414,9 @@ jobs:
424414
submodules: true
425415

426416
- name: Install Rust toolchain
427-
uses: actions-rs/toolchain@v1
417+
uses: dtolnay/rust-toolchain@master
428418
with:
429419
toolchain: ${{ matrix.nightly && env.CURRENT_NIGHTLY || 'stable' }}
430-
profile: minimal
431-
override: true
432420
components: ${{ matrix.build-std && 'rust-src' }}
433421
target: ${{ (!matrix.build-std) && matrix.target || null }}
434422

@@ -514,12 +502,10 @@ jobs:
514502
submodules: true
515503

516504
- name: Install Rust toolchain
517-
uses: actions-rs/toolchain@v1
505+
uses: dtolnay/rust-toolchain@master
518506
with:
519507
toolchain: stable
520-
profile: minimal
521-
override: true
522-
target: x86_64-apple-ios
508+
targets: x86_64-apple-ios
523509

524510
- name: Cache Cargo
525511
uses: actions/cache@v3
@@ -714,12 +700,10 @@ jobs:
714700
ls -al $HOME/extern/*
715701
716702
- name: Install Rust toolchain
717-
uses: actions-rs/toolchain@v1
703+
uses: dtolnay/rust-toolchain@master
718704
with:
719705
toolchain: ${{ matrix.nightly && env.CURRENT_NIGHTLY || 'stable' }}
720-
profile: minimal
721-
override: true
722-
target: ${{ matrix.target }}
706+
targets: ${{ matrix.target }}
723707

724708
- name: Cache Cargo
725709
uses: actions/cache@v3

0 commit comments

Comments
 (0)