Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move mkdir call out of with_curl_script

Browse source
This commit is contained in:
Simon Sapin 2019-11-21 23:20:28 +01:00
parent 83921dbc99
commit b96a36c131
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
etc/taskcluster/decision_task.py
View file

@ -378,7 +378,7 @@ def android_x86_release():
def android_x86_wpt(): def android_x86_wpt():
build_task = android_x86_release() build_task = android_x86_release()
return ( task = (
linux_task("WPT") linux_task("WPT")
.with_treeherder("Android x86") .with_treeherder("Android x86")
.with_provisioner_id("proj-servo") .with_provisioner_id("proj-servo")
@ -387,7 +387,12 @@ def android_x86_wpt():
.with_scopes("project:servo:docker-worker-kvm:capability:privileged") .with_scopes("project:servo:docker-worker-kvm:capability:privileged")
.with_dockerfile(dockerfile_path("run-android-emulator")) .with_dockerfile(dockerfile_path("run-android-emulator"))
.with_repo() .with_repo()
.with_curl_artifact_script(build_task, "servoapp.apk", "target/android/i686-linux-android/release") )
apk_dir = "target/android/i686-linux-android/release"
return (
task
.with_script("mkdir -p " + apk_dir)
.with_curl_artifact_script(build_task, "servoapp.apk", apk_dir)
.with_script(""" .with_script("""
./mach bootstrap-android --accept-all-licences --emulator-x86 ./mach bootstrap-android --accept-all-licences --emulator-x86
./mach test-android-startup --release ./mach test-android-startup --release

1
etc/taskcluster/decisionlib.py
View file

@ -629,7 +629,6 @@ class UnixTaskMixin(Task):
"CURL_%s_PATH" % n: file_path, "CURL_%s_PATH" % n: file_path,
}) \ }) \
.with_script(""" .with_script("""
mkdir -p $(dirname "$CURL_{n}_PATH")
curl --retry 5 --connect-timeout 10 -Lf "$CURL_{n}_URL" -o "$CURL_{n}_PATH" curl --retry 5 --connect-timeout 10 -Lf "$CURL_{n}_URL" -o "$CURL_{n}_PATH"
""".format(n=n)) """.format(n=n))