Skip to content

Commit 600810b

Browse files
committed
Auto merge of #2213 - JohnTitor:freebsd-rustup-beta, r=JohnTitor
Use Rustup v1.24.3 beta on FreeBSD CI r? `@ghost`
2 parents a78ab12 + b078aa6 commit 600810b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.cirrus.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
env:
22
# Temporary fix for https://github.com/rust-lang/rustup/issues/2774.
3-
RUSTUP_IO_THREADS: "1"
3+
RUSTUP_UPDATE_ROOT: "https://dev-static.rust-lang.org/rustup"
44

55
task:
66
name: stable x86_64-unknown-freebsd-11
@@ -11,7 +11,7 @@ task:
1111
- curl https://sh.rustup.rs -sSf --output rustup.sh
1212
- sh rustup.sh -y --profile=minimal
1313
- . $HOME/.cargo/env
14-
- rustup default stable
14+
- rustup --version
1515
test_script:
1616
- . $HOME/.cargo/env
1717
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
@@ -26,7 +26,6 @@ task:
2626
- curl https://sh.rustup.rs -sSf --output rustup.sh
2727
- sh rustup.sh --default-toolchain nightly -y --profile=minimal
2828
- . $HOME/.cargo/env
29-
- rustup default nightly
3029
test_script:
3130
- . $HOME/.cargo/env
3231
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
@@ -39,9 +38,8 @@ task:
3938
setup_script:
4039
- pkg install -y curl
4140
- curl https://sh.rustup.rs -sSf --output rustup.sh
42-
- sh rustup.sh -y --profile=minimal
41+
- sh rustup.sh -y --default-toolchain nightly --profile=minimal
4342
- . $HOME/.cargo/env
44-
- rustup default nightly
4543
test_script:
4644
- . $HOME/.cargo/env
4745
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd

0 commit comments

Comments
 (0)