Commit 645122c
committed
Install missing
This works around the combination of these two conditions, which
individually wouldn't be a problem but are a problem together:
- The newly available `windows-11-arm` runner does not currently
have `rustup` installed on it.
- Although the `dtolnay/rust-toolchain` action will attempt to
install `rustup` when it is absent on Unix-like systems, it does
not attempt to do so on Windows.
(If the latter condition is fixed, however, then depending on *how*
it is fixed, it might still be necessary to install `rustup`
ourselves. Specifically, it is easy to accidentally download a
`rustup-init.exe` for x86-64 even when on ARM64/AArch64 Windows.)
The new step here, added for both of the `windows-11-arm` jobs, is
intended to be similar in its effect to these commands that
`dtolnay/rustup-init` runs on Unix-like systems:
https://github.com/actions-rust-lang/setup-rust-toolchain/blob/9399c7bb15d4c7d47b27263d024f0a4978346ba4/action.yml#L136-L139
Note that this is not quite equivalent. It is intentionally less
versatile in two ways:
- It hard-codes the AArch64 `rustup-init.exe` URL, to ensure that
it is selected, rather than not finding anything or wrongly
getting a URL for a Unix-like system or for x86-64 Windows.
- No attempt is made to respect a preexisting `CARGO_HOME`
environment variable (since we do not set one in these jobs).
(This uses the style `$Env:varname` rather than `$env:varname` in
PowerShell because the former seems to be much more common in the
Microsoft documentation, and changes one preexisting occurrence
of `$env` to `$Env` for stylistic consistency.)rustup in windows-11-arm jobs1 parent e45ec79 commit 645122c
1 file changed
+27
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
173 | 186 | | |
174 | 187 | | |
175 | 188 | | |
| |||
194 | 207 | | |
195 | 208 | | |
196 | 209 | | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
197 | 223 | | |
198 | 224 | | |
199 | 225 | | |
| |||
296 | 322 | | |
297 | 323 | | |
298 | 324 | | |
299 | | - | |
| 325 | + | |
300 | 326 | | |
301 | 327 | | |
302 | 328 | | |
| |||
0 commit comments