Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid instaling rustc-dev twice.

Browse source
This commit is contained in:
Josh Matthews 2019-10-31 12:30:05 -04:00
parent 6c4d5f4410
commit c29557e02d
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
etc/taskcluster/decision_task.py
View file

@ -267,7 +267,7 @@ def with_rust_nightly():
modified_build_env["RUSTFLAGS"] = " ".join(flags) modified_build_env["RUSTFLAGS"] = " ".join(flags)
return ( 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_treeherder("Linux x64", "RustNightly")
.with_script(""" .with_script("""
echo "nightly" > rust-toolchain echo "nightly" > rust-toolchain
@ -748,8 +748,8 @@ def macos_task(name):
) )
def linux_build_task(name, *, build_env=build_env): def linux_build_task(name, *, build_env=build_env, install_rustc_dev=True):
return ( task = (
linux_task(name) linux_task(name)
# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches
.with_scopes("docker-worker:cache:servo-*") .with_scopes("docker-worker:cache:servo-*")
@ -766,9 +766,11 @@ def linux_build_task(name, *, build_env=build_env):
.with_env(**build_env, **unix_build_env, **linux_build_env) .with_env(**build_env, **unix_build_env, **linux_build_env)
.with_repo() .with_repo()
.with_script("rustup set profile minimal") .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): def android_build_task(name):