Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24603 - servo:jdm-patch-36, r=SimonSapin

Browse source 
Install rustc-dev for nightly rust toolchain

Fixes #24579.
This commit is contained in:
bors-servo 2019-11-03 06:38:28 -05:00 • committed by GitHub
commit 7f77cb0bde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
etc/taskcluster/decision_task.py
View file

@ -273,10 +273,11 @@ def with_rust_nightly():
modified_build_env["RUSTFLAGS"] = " ".join(flags)
return (
linux_build_task("with Rust Nightly", build_env=modified_build_env)
linux_build_task("with Rust Nightly", build_env=modified_build_env, install_rustc_dev=False)
.with_treeherder("Linux x64", "RustNightly")
.with_script("""
echo "nightly" > rust-toolchain
rustup component add rustc-dev
./mach build --dev
./mach test-unit
""")
@ -753,8 +754,8 @@ def macos_task(name):
)
def linux_build_task(name, *, build_env=build_env):
return (
def linux_build_task(name, *, build_env=build_env, install_rustc_dev=True):
task = (
linux_task(name)
# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches
.with_scopes("docker-worker:cache:servo-*")
@ -771,9 +772,11 @@ def linux_build_task(name, *, build_env=build_env):
.with_env(**build_env, **unix_build_env, **linux_build_env)
.with_repo()
.with_script("rustup set profile minimal")
# required by components/script_plugins:
.with_script("rustup component add rustc-dev")
)
if install_rustc_dev:
# required by components/script_plugins:
task = task.with_script("rustup component add rustc-dev")
return task
def android_build_task(name):