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

Taskcluster: install the rustc-dev rustup component, required for compiler plugins

Browse source
This commit is contained in:
Simon Sapin 2019-10-27 17:54:29 +01:00
parent d3439fb4d1
commit 6ba0fabc73
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
etc/taskcluster/decision_task.py
View file

@ -157,6 +157,9 @@ def linux_tidy_unit_untrusted():
.with_dockerfile(dockerfile_path("build")) .with_dockerfile(dockerfile_path("build"))
.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")
# required by components/script_plugins:
.with_script("rustup component add rustc-dev")
.with_script(""" .with_script("""
./mach test-tidy --no-progress --all ./mach test-tidy --no-progress --all
./mach test-tidy --no-progress --self-test ./mach test-tidy --no-progress --self-test
@ -761,6 +764,9 @@ def linux_build_task(name, *, build_env=build_env):
.with_dockerfile(dockerfile_path("build")) .with_dockerfile(dockerfile_path("build"))
.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")
# required by components/script_plugins:
.with_script("rustup component add rustc-dev")
) )
@ -806,6 +812,9 @@ def windows_build_task(name, package=True, arch="x86_64"):
path="python3", path="python3",
) )
.with_rustup() .with_rustup()
.with_script("rustup set profile minimal")
# required by components/script_plugins:
.with_script("rustup component add rustc-dev")
) )
if arch in hashes["non-devel"] and arch in hashes["devel"]: if arch in hashes["non-devel"] and arch in hashes["devel"]:
task = ( task = (
@ -858,6 +867,11 @@ def macos_build_task(name):
.with_repo() .with_repo()
.with_python2() .with_python2()
.with_rustup() .with_rustup()
# Since macOS workers are long-lived and ~/.rustup kept across tasks:
.with_script("rustup self update")
.with_script("rustup set profile minimal")
# required by components/script_plugins:
.with_script("rustup component add rustc-dev")
.with_index_and_artifacts_expire_in(build_artifacts_expire_in) .with_index_and_artifacts_expire_in(build_artifacts_expire_in)
# Debugging for surprising generic-worker behaviour # Debugging for surprising generic-worker behaviour
.with_early_script("ls") .with_early_script("ls")

2
etc/taskcluster/decisionlib.py
View file

@ -657,8 +657,6 @@ class MacOsGenericWorkerTask(UnixTaskMixin, GenericWorkerTask):
return self.with_early_script(""" return self.with_early_script("""
export PATH="$HOME/.cargo/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH"
which rustup || curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y which rustup || curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
rustup self update
rustup set profile minimal
""") """)