diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-03-02 13:13:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-02 13:13:58 -0500 |
commit | 3cbbb2bc8c0477f4ef453c88b5155d505f0cd3e5 (patch) | |
tree | 47c11c4f156b9c1b73e746f4b3fe50c555a2aa98 | |
parent | 5a6b2d94d4c2ed93c2db136f5d00ea324e6c2a65 (diff) | |
parent | 74aca0703f4802eea1f302cb5e80b1615ac1fcf1 (diff) | |
download | servo-3cbbb2bc8c0477f4ef453c88b5155d505f0cd3e5.tar.gz servo-3cbbb2bc8c0477f4ef453c88b5155d505f0cd3e5.zip |
Auto merge of #25877 - servo:byebye-android, r=jdm
Disable Android CI builds
-rw-r--r-- | etc/taskcluster/decision_task.py | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index afa83cc4c1b..01809fe6b97 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -32,11 +32,6 @@ def tasks(task_for): magicleap_nightly = lambda: None if task_for == "github-push": - # FIXME https://github.com/servo/servo/issues/22187 - # In-emulator testing is disabled for now. (Instead we only compile.) - # This local variable shadows the module-level function of the same name. - android_x86_wpt = android_x86_release - all_tests = [ linux_tidy_unit, linux_docs_check, @@ -45,10 +40,6 @@ def tasks(task_for): windows_uwp_x64, macos_unit, magicleap_dev, - android_arm32_dev, - android_arm32_dev_from_macos, - android_arm32_release, - android_x86_wpt, linux_wpt, linux_wpt_layout_2020, linux_release, @@ -75,12 +66,6 @@ def tasks(task_for): "try-wpt": [linux_wpt], "try-wpt-2020": [linux_wpt_layout_2020], "try-wpt-mac": [macos_wpt], - "try-wpt-android": [android_x86_wpt], - "try-android": [ - android_arm32_dev, - android_arm32_dev_from_macos, - android_x86_wpt - ], } for function in by_branch_name.get(branch, []): function() @@ -107,7 +92,6 @@ def tasks(task_for): daily_tasks_setup() with_rust_nightly() linux_nightly() - android_nightly() windows_nightly() macos_nightly() update_wpt() @@ -119,7 +103,6 @@ def tasks(task_for): # but should still run when testing this Python code. (See `mock.py`.) def mocked_only(): windows_release() - android_x86_wpt() magicleap_dev() magicleap_nightly() decisionlib.DockerWorkerTask("Indexed by task definition").find_or_create() @@ -313,111 +296,6 @@ def with_rust_nightly(): ) -def android_arm32_dev_from_macos(): - return ( - macos_build_task("Dev build (macOS)") - .with_treeherder("Android ARMv7", "Dev(macOS)") - .with_script(""" - export HOST_CC="$(brew --prefix llvm)/bin/clang" - export HOST_CXX="$(brew --prefix llvm)/bin/clang++" - ./mach bootstrap-android --accept-all-licences --build - ./mach build --android --dev --verbose - """) - .find_or_create("android_arm32_dev.macos." + CONFIG.task_id()) - ) - - -def android_arm32_dev(): - return ( - android_build_task("Dev build") - .with_treeherder("Android ARMv7", "Dev") - .with_script(""" - ./mach build --android --dev - ./etc/ci/lockfile_changed.sh - python ./etc/ci/check_dynamic_symbols.py - """) - .find_or_create("android_arm32_dev." + CONFIG.task_id()) - ) - - -def android_nightly(): - return ( - android_build_task("Nightly build and upload") - .with_treeherder("Android", "Nightlies") - .with_features("taskclusterProxy") - .with_scopes("secrets:get:project/servo/s3-upload-credentials") - .with_script(""" - ./mach build --release --android - ./mach package --release --android --maven - ./mach build --release --target i686-linux-android - ./mach package --release --target i686-linux-android --maven - ./mach upload-nightly android --secret-from-taskcluster - ./mach upload-nightly maven --secret-from-taskcluster - """) - .with_artifacts( - "/repo/target/android/armv7-linux-androideabi/release/servoapp.apk", - "/repo/target/android/armv7-linux-androideabi/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_nightlies." + CONFIG.task_id()) - ) - - -def android_arm32_release(): - return ( - android_build_task("Release build") - .with_treeherder("Android ARMv7", "Release") - .with_script("./mach build --android --release") - .with_artifacts( - "/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.task_id()) - ) - - -def android_x86_release(): - return ( - android_build_task("Release build") - .with_treeherder("Android x86", "Release") - .with_script("./mach build --target i686-linux-android --release") - .with_artifacts( - "/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.task_id()) - ) - - -def android_x86_wpt(): - build_task = android_x86_release() - task = ( - linux_task("WPT") - .with_treeherder("Android x86", "WPT") - .with_provisioner_id("proj-servo") - .with_worker_type("docker-worker-kvm") - .with_capabilities(privileged=True) - .with_scopes("project:servo:docker-worker-kvm:capability:privileged") - .with_dockerfile(dockerfile_path("run-android-emulator")) - .with_repo_bundle() - ) - 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(""" - ./mach bootstrap-android --accept-all-licences --emulator-x86 - ./mach test-android-startup --release - ./mach test-wpt-android --release \ - /_mozilla/mozilla/DOMParser.html \ - /_mozilla/mozilla/webgl/context_creation_error.html - """) - .find_or_create("android_x86_release." + CONFIG.task_id()) - ) - - def appx_artifact(debug): return '/'.join([ 'repo', @@ -880,19 +758,6 @@ def linux_build_task(name, *, build_env=build_env): return task -def android_build_task(name): - return ( - linux_build_task(name) - # file: NDK parses $(file $SHELL) to tell x64 host from x86 - # wget: servo-media-gstreamer’s build script - .with_script(""" - time apt-get update -q - time apt-get install -y --no-install-recommends openjdk-8-jdk-headless file wget - time ./mach bootstrap-android --accept-all-licences --build - """) - ) - - def windows_build_task(name, package=True, arch="x86_64"): hashes = { "devel": { |