File tree 5 files changed +24
-6
lines changed
5 files changed +24
-6
lines changed Original file line number Diff line number Diff line change @@ -43,6 +43,10 @@ export PATH=$HOME/.local/bin:$PATH
43
43
44
44
if ! [ -e /Volumes/a/init/built_servo_once_successfully ]; then
45
45
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
+
46
50
./mach bootstrap --force
47
51
# Build the same way as a typical macOS libservo job, to allow for incremental builds.
48
52
cargo build -p libservo --all-targets --release --target-dir target/libservo
Original file line number Diff line number Diff line change @@ -9,9 +9,9 @@ if ! dpkg -s "$@" > /dev/null 2>&1; then
9
9
apt install -y " $@ "
10
10
fi
11
11
12
- # Install rustup and Rust 1.80.1
12
+ # Install rustup and the latest Rust
13
13
if ! [ -e /root/.rustup ]; then
14
- /init/rustup-init.sh --default-toolchain 1.80.1 - y --quiet
14
+ /init/rustup-init.sh -y --quiet
15
15
fi
16
16
17
17
# ~/.cargo/env requires HOME to be set
@@ -47,6 +47,10 @@ export PATH=$HOME/.local/bin:$PATH
47
47
48
48
if ! [ -e /init/built_servo_once_successfully ]; then
49
49
cd /a/servo/servo
50
+
51
+ # Install the Rust toolchain, for checkouts without servo#35795
52
+ rustup show active-toolchain || rustup toolchain install
53
+
50
54
./mach bootstrap --force
51
55
# Build the same way as a typical Linux build job, to allow for incremental builds.
52
56
export CARGO_LOG=cargo::core::compiler::fingerprint=info
Original file line number Diff line number Diff line change @@ -9,9 +9,9 @@ if ! dpkg -s "$@" > /dev/null 2>&1; then
9
9
apt install -y " $@ "
10
10
fi
11
11
12
- # Install rustup and Rust 1.80.1
12
+ # Install rustup and the latest Rust
13
13
if ! [ -e /root/.rustup ]; then
14
- /init/rustup-init.sh --default-toolchain 1.80.1 - y --quiet
14
+ /init/rustup-init.sh -y --quiet
15
15
fi
16
16
17
17
# ~/.cargo/env requires HOME to be set
@@ -43,6 +43,10 @@ export PATH=$HOME/.local/bin:$PATH
43
43
44
44
if ! [ -e /init/built_servo_once_successfully ]; then
45
45
cd /a/servo/servo
46
+
47
+ # Install the Rust toolchain, for checkouts without servo#35795
48
+ rustup show active-toolchain || rustup toolchain install
49
+
46
50
./mach bootstrap --force
47
51
# Build the same way as a typical Linux libservo job, to allow for incremental builds.
48
52
cargo build -p libservo --all-targets --release --target-dir target/libservo
Original file line number Diff line number Diff line change @@ -35,9 +35,9 @@ if (!(Test-Path C:\Users\Administrator\.local\bin\uv.exe)) {
35
35
. C:\init\install-uv.ps1
36
36
}
37
37
38
- # Install rustup and Rust 1.80.1
38
+ # Install rustup and the latest Rust
39
39
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
41
41
}
42
42
43
43
# Install .NET 4.8 for Chocolatey
Original file line number Diff line number Diff line change @@ -15,6 +15,12 @@ git reset --hard
15
15
choco install - y support\windows\chocolatey.config
16
16
. C:\init\refreshenv.ps1
17
17
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
+
18
24
.\mach bootstrap -- skip-platform
19
25
20
26
# Save a copy of the environment variables that can break incremental builds, for debugging.
You can’t perform that action at this time.
0 commit comments