mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
Add a decision task for try-windows-ami
This commit is contained in:
parent
7474b309b4
commit
b3ca13cc65
2 changed files with 21 additions and 8 deletions
|
@ -90,6 +90,10 @@ def main(task_for):
|
|||
|
||||
linux_tidy_unit_untrusted()
|
||||
|
||||
elif task_for == "try-windows-ami":
|
||||
CONFIG.git_sha_is_current_head()
|
||||
windows_unit(os.environ["NEW_AMI_WORKER_TYPE"], cached=False)
|
||||
|
||||
# https://tools.taskcluster.net/hooks/project-servo/daily
|
||||
elif task_for == "daily":
|
||||
daily_tasks_setup()
|
||||
|
@ -447,9 +451,9 @@ def uwp_nightly():
|
|||
)
|
||||
|
||||
|
||||
def windows_unit():
|
||||
return (
|
||||
windows_build_task("Dev build + unit tests")
|
||||
def windows_unit(worker_type=None, cached=True):
|
||||
task = (
|
||||
windows_build_task("Dev build + unit tests", worker_type=worker_type)
|
||||
.with_treeherder("Windows x64", "Unit")
|
||||
.with_script(
|
||||
# Not necessary as this would be done at the start of `build`,
|
||||
|
@ -464,8 +468,11 @@ def windows_unit():
|
|||
)
|
||||
.with_artifacts("repo/target/debug/msi/Servo.exe",
|
||||
"repo/target/debug/msi/Servo.zip")
|
||||
.find_or_create("build.windows_x64_dev." + CONFIG.task_id())
|
||||
)
|
||||
if cached:
|
||||
return task.find_or_create("build.windows_x64_dev." + CONFIG.task_id())
|
||||
else:
|
||||
return task.create()
|
||||
|
||||
|
||||
def windows_release():
|
||||
|
@ -744,10 +751,12 @@ def linux_task(name):
|
|||
)
|
||||
|
||||
|
||||
def windows_task(name):
|
||||
def windows_task(name, worker_type=None):
|
||||
if worker_type is None:
|
||||
worker_type = "servo-win2016" if CONFIG.legacy_tc_deployment else "win2016"
|
||||
return (
|
||||
decisionlib.WindowsGenericWorkerTask(name)
|
||||
.with_worker_type("servo-win2016" if CONFIG.legacy_tc_deployment else "win2016")
|
||||
.with_worker_type(worker_type)
|
||||
.with_treeherder_required()
|
||||
)
|
||||
|
||||
|
@ -799,7 +808,7 @@ def android_build_task(name):
|
|||
)
|
||||
|
||||
|
||||
def windows_build_task(name, package=True, arch="x86_64"):
|
||||
def windows_build_task(name, package=True, arch="x86_64", worker_type=None):
|
||||
hashes = {
|
||||
"devel": {
|
||||
"x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605",
|
||||
|
@ -813,7 +822,7 @@ def windows_build_task(name, package=True, arch="x86_64"):
|
|||
}
|
||||
version = "1.16.0"
|
||||
task = (
|
||||
windows_task(name)
|
||||
windows_task(name, worker_type=worker_type)
|
||||
.with_max_run_time_minutes(90)
|
||||
.with_env(
|
||||
**build_env,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue