Skip to content
Permalink
Browse files

Add android-mac build job to taskcluster.

  • Loading branch information...
jdm committed May 9, 2019
1 parent af077f8 commit 34d3c5e1ce1d62ad4add7f7963f6cc20dbb59b86
Showing with 15 additions and 12 deletions.
  1. +1 −10 etc/ci/buildbot_steps.yml
  2. +14 −2 etc/taskcluster/decision_task.py
@@ -124,16 +124,6 @@ linux-nightly:
- rm -rf ./python/_virtualenv
- ./etc/ci/clean_build_artifacts.sh

android-mac:
commands:
- ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force
- ./mach bootstrap-android --accept-all-licences --build
- ./mach build --android --dev
- ./mach package --android --dev
- bash ./etc/ci/lockfile_changed.sh
- ./etc/ci/clean_build_artifacts.sh

magicleap:
env:
MAGICLEAP_SDK: /Users/servo/magicleap/v0.17.0
@@ -225,6 +215,7 @@ arm64:
linux-dev: []
mac-dev-unit: []
windows-msvc-dev: []
android-mac: []
android: []
android-x86: []
mac-rel-wpt1: []
@@ -18,8 +18,7 @@ def main(task_for):

if task_for == "github-push":
# FIXME https://github.com/servo/servo/issues/22325 implement these:
magicleap_dev = linux_arm32_dev = linux_arm64_dev = \
android_arm32_dev_from_macos = lambda: None
magicleap_dev = linux_arm32_dev = linux_arm64_dev = lambda: None

# FIXME https://github.com/servo/servo/issues/22187
# In-emulator testing is disabled for now. (Instead we only compile.)
@@ -36,6 +35,7 @@ def main(task_for):
macos_unit,
magicleap_dev,
android_arm32_dev,
android_arm32_dev_from_macos,
android_arm32_release,
android_x86_wpt,
linux_arm32_dev,
@@ -251,6 +251,18 @@ def with_rust_nightly():
)


def android_arm32_dev_from_macos():
return (
macos_build_task("Dev build (macOS)")
.with_treeherder("Android ARMv7")
.with_script("""
./mach bootstrap-android --accept-all-licences --build
./mach build --android --dev
""")
.find_or_create("android_arm32_dev.macos." + CONFIG.git_sha)
)


def android_arm32_dev():
return (
android_build_task("Dev build")

0 comments on commit 34d3c5e

Please sign in to comment.
You can’t perform that action at this time.