Skip to content

Commit

Permalink
Auto merge of #12180 - weihanglo:remove-tmp-fix, r=epage
Browse files Browse the repository at this point in the history
chore(ci): remove temporary fix for rustup 1.24.1

rust-lang/rustup#2759 was fixed in 1.24.2 and now GitHub ships 1.26.0 [^1]. The temporary workaround is not needed anymore. Let's see if everything goes well!

[^1]: https://github.com/actions/runner-images/blob/156ad8a318284c617f76cef1077cd0d64aeb758e/images/linux/Ubuntu2204-Readme.md?plain=1#L151
  • Loading branch information
bors committed May 25, 2023
2 parents d90ff55 + f5e39a8 commit 6ec9649
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ jobs:
- uses: actions/checkout@v3
- name: Dump Environment
run: ci/dump-environment.sh
- 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 6ec9649

Please sign in to comment.