diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-03 06:38:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 06:38:28 -0500 |
| commit | 7f77cb0bde01065e82cbb50214f3d21811fdd7dc (patch) | |
| tree | 8ab69c2afd60eedd4fdb68ab3963df777f349d28 /etc/taskcluster/decision_task.py | |
| parent | 4ad08fff04d974855845bb1bafe10920bfd27a97 (diff) | |
| parent | c29557e02d28ff40422e22161f318db8b1864a1e (diff) | |
| download | servo-7f77cb0bde01065e82cbb50214f3d21811fdd7dc.tar.gz servo-7f77cb0bde01065e82cbb50214f3d21811fdd7dc.zip | |
Auto merge of #24603 - servo:jdm-patch-36, r=SimonSapin
Install rustc-dev for nightly rust toolchain
Fixes #24579.
Diffstat (limited to 'etc/taskcluster/decision_task.py')
| -rw-r--r-- | etc/taskcluster/decision_task.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index b166c6d8fe9..00af26c0200 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -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): |