Skip to content

Commit 6a9bb97

Browse files
committed
Auto merge of #2223 - JohnTitor:rustup-1.24.3, r=JohnTitor
Some CI cleanups Rustup 1.24.3 is now released officially: https://blog.rust-lang.org/2021/06/08/Rustup-1.24.3.html And do rustup self-update as a separate step to avoid "device or resource busy" error.
2 parents 28a7400 + 79fc701 commit 6a9bb97

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.cirrus.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
env:
2-
# Temporary fix for https://github.com/rust-lang/rustup/issues/2774.
3-
RUSTUP_UPDATE_ROOT: "https://dev-static.rust-lang.org/rustup"
4-
51
task:
62
name: stable x86_64-unknown-freebsd-11
73
freebsd_instance:

.github/workflows/bors.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ jobs:
7272
with:
7373
github_token: "${{ secrets.GITHUB_TOKEN }}"
7474
- uses: actions/checkout@v2
75+
- name: Self-update rustup
76+
run: rustup self update
77+
shell: bash
7578
- name: Setup Rust toolchain
7679
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
7780
shell: bash

.github/workflows/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ jobs:
6464
- target: i686-pc-windows-msvc
6565
steps:
6666
- uses: actions/checkout@v2
67+
- name: Self-update rustup
68+
run: rustup self update
69+
shell: bash
6770
- name: Setup Rust toolchain
6871
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
6972
shell: bash

ci/install-rust.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ else
1212
fi
1313
if [ "$OS" = "windows" ]; then
1414
: "${TARGET?The TARGET environment variable must be set.}"
15-
rustup self update
1615
rustup set profile minimal
1716
rustup update --force $toolchain-"$TARGET"
1817
rustup default $toolchain-"$TARGET"

0 commit comments

Comments
 (0)