Move Android and ML build artefacts to their own subdirectory

Works around #20380.
This commit is contained in:
Anthony Ramine 2018-11-27 13:26:38 +01:00
parent 524bd722ef
commit 496a62860e
10 changed files with 51 additions and 47 deletions

View file

@ -113,8 +113,8 @@ def android_arm32():
.with_treeherder("Android ARMv7")
.with_script("./mach build --android --release")
.with_artifacts(
"/repo/target/armv7-linux-androideabi/release/servoapp.apk",
"/repo/target/armv7-linux-androideabi/release/servoview.aar",
"/repo/target/android/armv7-linux-androideabi/release/servoapp.apk",
"/repo/target/android/armv7-linux-androideabi/release/servoview.aar",
)
.find_or_create("build.android_armv7_release." + CONFIG.git_sha)
)
@ -126,8 +126,8 @@ def android_x86():
.with_treeherder("Android x86")
.with_script("./mach build --target i686-linux-android --release")
.with_artifacts(
"/repo/target/i686-linux-android/release/servoapp.apk",
"/repo/target/i686-linux-android/release/servoview.aar",
"/repo/target/android/i686-linux-android/release/servoapp.apk",
"/repo/target/android/i686-linux-android/release/servoview.aar",
)
.find_or_create("build.android_x86_release." + CONFIG.git_sha)
)
@ -140,7 +140,7 @@ def android_x86():
.with_scopes("project:servo:docker-worker-kvm:capability:privileged")
.with_dockerfile(dockerfile_path("run-android-emulator"))
.with_repo()
.with_curl_artifact_script(build_task, "servoapp.apk", "target/i686-linux-android/release")
.with_curl_artifact_script(build_task, "servoapp.apk", "target/android/i686-linux-android/release")
.with_script("""
./mach bootstrap-android --accept-all-licences --emulator-x86
./mach test-android-startup --release