Skip to content

Commit b1700d0

Browse files
committed
Work around rustup bustage in mach bootstrap (servo/servo#35795) (#27)
1 parent cc1295d commit b1700d0

File tree

5 files changed

+24
-6
lines changed

5 files changed

+24
-6
lines changed

macos13/init.sh

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ export PATH=$HOME/.local/bin:$PATH
4343

4444
if ! [ -e /Volumes/a/init/built_servo_once_successfully ]; then
4545
cd /Volumes/a/a/servo/servo
46+
47+
# Install the Rust toolchain, for checkouts without servo#35795
48+
rustup show active-toolchain || rustup toolchain install
49+
4650
./mach bootstrap --force
4751
# Build the same way as a typical macOS libservo job, to allow for incremental builds.
4852
cargo build -p libservo --all-targets --release --target-dir target/libservo

ubuntu2204-wpt/init.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ if ! dpkg -s "$@" > /dev/null 2>&1; then
99
apt install -y "$@"
1010
fi
1111

12-
# Install rustup and Rust 1.80.1
12+
# Install rustup and the latest Rust
1313
if ! [ -e /root/.rustup ]; then
14-
/init/rustup-init.sh --default-toolchain 1.80.1 -y --quiet
14+
/init/rustup-init.sh -y --quiet
1515
fi
1616

1717
# ~/.cargo/env requires HOME to be set
@@ -47,6 +47,10 @@ export PATH=$HOME/.local/bin:$PATH
4747

4848
if ! [ -e /init/built_servo_once_successfully ]; then
4949
cd /a/servo/servo
50+
51+
# Install the Rust toolchain, for checkouts without servo#35795
52+
rustup show active-toolchain || rustup toolchain install
53+
5054
./mach bootstrap --force
5155
# Build the same way as a typical Linux build job, to allow for incremental builds.
5256
export CARGO_LOG=cargo::core::compiler::fingerprint=info

ubuntu2204/init.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ if ! dpkg -s "$@" > /dev/null 2>&1; then
99
apt install -y "$@"
1010
fi
1111

12-
# Install rustup and Rust 1.80.1
12+
# Install rustup and the latest Rust
1313
if ! [ -e /root/.rustup ]; then
14-
/init/rustup-init.sh --default-toolchain 1.80.1 -y --quiet
14+
/init/rustup-init.sh -y --quiet
1515
fi
1616

1717
# ~/.cargo/env requires HOME to be set
@@ -43,6 +43,10 @@ export PATH=$HOME/.local/bin:$PATH
4343

4444
if ! [ -e /init/built_servo_once_successfully ]; then
4545
cd /a/servo/servo
46+
47+
# Install the Rust toolchain, for checkouts without servo#35795
48+
rustup show active-toolchain || rustup toolchain install
49+
4650
./mach bootstrap --force
4751
# Build the same way as a typical Linux libservo job, to allow for incremental builds.
4852
cargo build -p libservo --all-targets --release --target-dir target/libservo

windows10/init.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ if (!(Test-Path C:\Users\Administrator\.local\bin\uv.exe)) {
3535
. C:\init\install-uv.ps1
3636
}
3737

38-
# Install rustup and Rust 1.80.1
38+
# Install rustup and the latest Rust
3939
if (!(Test-Path C:\Users\Administrator\.rustup)) {
40-
C:\init\rustup-init.exe --default-toolchain 1.80.1 -y --quiet
40+
C:\init\rustup-init.exe -y --quiet
4141
}
4242

4343
# Install .NET 4.8 for Chocolatey

windows10/warm.ps1

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ git reset --hard
1515
choco install -y support\windows\chocolatey.config
1616
. C:\init\refreshenv.ps1
1717

18+
# Install the Rust toolchain, for checkouts without servo#35795
19+
rustup show active-toolchain
20+
if ($LASTEXITCODE -ne 0) {
21+
rustup toolchain install
22+
}
23+
1824
.\mach bootstrap --skip-platform
1925

2026
# Save a copy of the environment variables that can break incremental builds, for debugging.

0 commit comments

Comments
 (0)