Skip to content

Commit

Permalink
Auto merge of #9498 - ehuss:rustup-windows-workaround, r=alexcrichton
Browse files Browse the repository at this point in the history
Add temporary fix for rustup on windows in CI.

This adds a temporary fix for rustup on the Windows CI runners. The GitHub image updated to rustup 1.24.1 which has an issue (rust-lang/rustup#2759) causing them to fail.  This is fixed in 1.24.2.  I believe the images are updated on roughly a weekly basis, and from what I can see the image just downloads the most recently release, so hopefully this will be fixed on GitHub's side in roughly a week. Until then, this will force rustup to update.

Note: Self updates aren't available on macOS images, but they seem to work on the others.
  • Loading branch information
bors committed May 18, 2021
2 parents f0b39fc + 65ca4e0 commit 0d9bc9d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ jobs:
other: i686-pc-windows-gnu
steps:
- uses: actions/checkout@v2
- name: Update Rustup (temporary workaround)
run: rustup self update
shell: bash
if: startsWith(matrix.os, 'windows')
- run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
- run: rustup target add ${{ matrix.other }}
- run: rustup component add rustc-dev llvm-tools-preview rust-docs
Expand Down

0 comments on commit 0d9bc9d

Please sign in to comment.