Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22201 - servo:jdm-patch-24, r=simonsapin

Browse source 
Remove android emulator tests from buildbot CI.

This works around #22187 on CI, since I have not been able to figure out what changed yet. I can reproduce the problem locally, so I can keep poking at it without holding up all the other work going on.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22201)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-15 09:58:01 -05:00 • committed by GitHub
commit 359ec7a76f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/ci/buildbot_steps.yml
View file

@ -207,8 +207,6 @@ android-x86:
- ./etc/ci/clean_build_artifacts.sh - ./etc/ci/clean_build_artifacts.sh
- ./mach bootstrap-android --accept-all-licences --build --emulator-x86 - ./mach bootstrap-android --accept-all-licences --build --emulator-x86
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-android-startup --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-wpt-android --release /_mozilla/mozilla/DOMParser.html /_mozilla/mozilla/webgl/context_creation_error.html
- bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/lockfile_changed.sh
- ./etc/ci/clean_build_artifacts.sh - ./etc/ci/clean_build_artifacts.sh

2
etc/taskcluster/decision_task.py
View file

@ -13,12 +13,12 @@ def main(task_for, mock=False):
if CONFIG.git_ref in ["refs/heads/auto", "refs/heads/try", "refs/heads/try-taskcluster"]: if CONFIG.git_ref in ["refs/heads/auto", "refs/heads/try", "refs/heads/try-taskcluster"]:
linux_tidy_unit() linux_tidy_unit()
android_arm32() android_arm32()
android_x86()
windows_dev() windows_dev()
if mock: if mock:
windows_release() windows_release()
linux_wpt() linux_wpt()
linux_build_task("Indexed by task definition").find_or_create() linux_build_task("Indexed by task definition").find_or_create()
android_x86()
# https://tools.taskcluster.net/hooks/project-servo/daily # https://tools.taskcluster.net/hooks/project-servo/daily
elif task_for == "daily": elif task_for == "daily":