Skip to content

Commit d07d4e1

Browse files
Merge pull request #1783 from kristof-mattei/toolchain
chore: fix for rustup 1.28.0 not installing needed toolchain by default
2 parents ce94e4d + 9f283b7 commit d07d4e1

File tree

6 files changed

+23
-0
lines changed

6 files changed

+23
-0
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ jobs:
108108
rm ${HOME}/.cargo/bin/rustfmt
109109
110110
rustup update
111+
rustup show active-toolchain || rustup toolchain install
112+
rustup show
111113
112114
cargo --version
113115
@@ -187,6 +189,8 @@ jobs:
187189
rm ${HOME}/.cargo/bin/rustfmt
188190
189191
rustup update
192+
rustup show active-toolchain || rustup toolchain install
193+
rustup show
190194
191195
cargo --version
192196
@@ -233,6 +237,8 @@ jobs:
233237
rm ${HOME}/.cargo/bin/rustfmt
234238
235239
rustup update
240+
rustup show active-toolchain || rustup toolchain install
241+
rustup show
236242
237243
cargo --version
238244
@@ -274,6 +280,8 @@ jobs:
274280
rm ${HOME}/.cargo/bin/rustfmt
275281
276282
rustup update
283+
rustup show active-toolchain || rustup toolchain install
284+
rustup show
277285
278286
cargo --version
279287
@@ -400,6 +408,8 @@ jobs:
400408
rm ${HOME}/.cargo/bin/rustfmt
401409
402410
rustup update
411+
rustup show active-toolchain || rustup toolchain install
412+
rustup show
403413
404414
cargo --version
405415
@@ -449,6 +459,8 @@ jobs:
449459
rm ${HOME}/.cargo/bin/rustfmt
450460
451461
rustup update
462+
rustup show active-toolchain || rustup toolchain install
463+
rustup show
452464
453465
cargo --version
454466

.github/workflows/lint-commits.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ jobs:
4141
run: |
4242
rm ${HOME}/.cargo/bin/rustfmt
4343
rm ${HOME}/.cargo/bin/cargo-fmt
44+
4445
rustup update
46+
rustup show active-toolchain || rustup toolchain install
47+
rustup show
48+
4549
4650
cargo --version
4751

.github/workflows/publish-crate-after-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ jobs:
6666
rm ${HOME}/.cargo/bin/rustfmt
6767
6868
rustup update
69+
rustup show active-toolchain || rustup toolchain install
70+
rustup show
6971
7072
cargo --version
7173

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
rm ${HOME}/.cargo/bin/rustfmt
6161
6262
rustup update
63+
rustup show active-toolchain || rustup toolchain install
64+
rustup show
6365
6466
cargo --version
6567

.github/workflows/test-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
rm ${HOME}/.cargo/bin/rustfmt
5555
5656
rustup update
57+
rustup show active-toolchain || rustup toolchain install
58+
rustup show
5759
5860
cargo --version
5961

clippy.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
allowed-duplicate-crates = []

0 commit comments

Comments
 (0)