diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-10-31 12:30:05 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-10-31 12:30:44 -0400 |
| commit | c29557e02d28ff40422e22161f318db8b1864a1e (patch) | |
| tree | 34af0def563cf60fe9599d81a8829b4ed7cc482d | |
| parent | 6c4d5f44107bdd25336e49a0cccbda6f5ec25d01 (diff) | |
| download | servo-c29557e02d28ff40422e22161f318db8b1864a1e.tar.gz servo-c29557e02d28ff40422e22161f318db8b1864a1e.zip | |
Avoid instaling rustc-dev twice.
| -rw-r--r-- | etc/taskcluster/decision_task.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 880ddb6f527..f038f80ce03 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -267,7 +267,7 @@ 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 @@ -748,8 +748,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-*") @@ -766,9 +766,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): |