diff options
| author | bors <bors@rust-lang.org> | 2021-06-09 01:46:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-09 01:46:55 +0000 |
| commit | 6a9bb9790a569cf0fb65394f55950546d646dfc9 (patch) | |
| tree | fb2c928cf41e244f4a17ed1422faadd06dc905fd | |
| parent | 28a74003849c5707af0df9c346b51f6cf438a8f7 (diff) | |
| parent | 79fc7016cd89a3f3268375487432b4a5d587e136 (diff) | |
| download | rust-libc-6a9bb9790a569cf0fb65394f55950546d646dfc9.tar.gz | |
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.
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/bors.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 3 | ||||
| -rw-r--r-- | ci/install-rust.sh | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 381fa440c9..655f42bb48 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,3 @@ -env: - # Temporary fix for https://github.com/rust-lang/rustup/issues/2774. - RUSTUP_UPDATE_ROOT: "https://dev-static.rust-lang.org/rustup" - task: name: stable x86_64-unknown-freebsd-11 freebsd_instance: diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 5073de9993..241940a823 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -72,6 +72,9 @@ jobs: with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v2 + - name: Self-update rustup + run: rustup self update + shell: bash - name: Setup Rust toolchain run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh shell: bash diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b5f5daf97..06f02c2660 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,6 +64,9 @@ jobs: - target: i686-pc-windows-msvc steps: - uses: actions/checkout@v2 + - name: Self-update rustup + run: rustup self update + shell: bash - name: Setup Rust toolchain run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh shell: bash diff --git a/ci/install-rust.sh b/ci/install-rust.sh index 377f0d0cf0..dcd24b88ef 100644 --- a/ci/install-rust.sh +++ b/ci/install-rust.sh @@ -12,7 +12,6 @@ else fi if [ "$OS" = "windows" ]; then : "${TARGET?The TARGET environment variable must be set.}" - rustup self update rustup set profile minimal rustup update --force $toolchain-"$TARGET" rustup default $toolchain-"$TARGET" |