Skip to content

Commit

Permalink
Avoid instaling rustc-dev twice.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdm committed Oct 31, 2019
1 parent 6c4d5f4 commit c29557e
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions etc/taskcluster/decision_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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-*")
Expand All @@ -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):
Expand Down

0 comments on commit c29557e

Please sign in to comment.