Taskcluster: package the Windows build

This commit is contained in:
Simon Sapin 2018-10-07 14:50:36 +02:00
parent 0a7811111e
commit 2c7abbb2bf
2 changed files with 15 additions and 3 deletions

View file

@ -114,6 +114,15 @@ def windows_dev():
"mach build --dev",
"mach test-unit",
)
.with_directory_mount(
"https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip",
sha256="37f0a533b0978a454efb5dc3bd3598becf9660aaf4287e55bf68ca6b527d051d",
path="wix",
)
.with_path_from_homedir("wix")
.with_script("mach package --dev")
.with_artifacts("repo/target/debug/msi/Servo.exe",
"repo/target/debug/msi/Servo.zip")
.create()
)

View file

@ -205,7 +205,6 @@ class GenericWorkerTask(Task):
self.artifacts = []
with_max_run_time_minutes = chaining(setattr, "max_run_time_minutes")
with_artifacts = chaining(append_to_attr, "artifacts")
with_mounts = chaining(append_to_attr, "mounts")
with_env = chaining(update_attr, "env")
@ -223,15 +222,19 @@ class GenericWorkerTask(Task):
mounts=self.mounts,
artifacts=[
{
"type": "file",
"type": type_,
"path": path,
"name": "public/" + url_basename(path),
"expires": SHARED.from_now_json(self.index_and_artifacts_expire_in),
}
for path in self.artifacts
for type_, path in self.artifacts
],
)
def with_artifacts(self, *paths, type="file"):
self.artifacts.extend((type, path) for path in paths)
return self
def _mount_content(self, url_or_artifact_name, task_id, sha256):
if task_id:
content = {"taskId": task_id, "artifact": url_or_artifact_name}