Skip to content
Permalink
Browse files

Move nightly magicleap build to taskcluster.

  • Loading branch information...
jdm committed May 10, 2019
1 parent b1cc493 commit c37956074a5db76210a767d8ad73fc9440826b31
Showing with 66 additions and 3 deletions.
  1. +40 −0 etc/ci/buildbot_steps.yml
  2. +26 −3 etc/taskcluster/decision_task.py
@@ -126,17 +126,56 @@ linux-nightly:
- rm -rf ./python/_virtualenv
- ./etc/ci/clean_build_artifacts.sh

<<<<<<< HEAD
magicleap-nightly:
env:
MAGICLEAP_SDK: /Users/servo/magicleap/v0.17.0
MLCERT: /Users/servo/magicleap/certs/TempSharedCert.cert
=======
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

arm32:
env:
AR: /usr/bin/arm-linux-gnueabihf-ar
AS: /usr/bin/arm-linux-gnueabihf-as
CC: /usr/bin/clang-4.0
CFLAGS: --target=arm-unknown-linux-gnueabihf -march=armv7a -I/usr/arm-linux-gnueabihf/include/ -fuse-ld=/home/servo/buildbot/slave/arm32/build/support/arm32/fake-ld.sh -Wno-error=unused-command-line-argument
CPP: /usr/bin/clang-4.0 -E
CPPFLAGS: -I/usr/arm-linux-gnueabihf/include
CXX: /usr/bin/clang++-4.0
CXXFLAGS: --target=arm-unknown-linux-gnueabihf -march=armv7a -I/usr/arm-linux-gnueabihf/include/ -I/usr/arm-linux-gnueabihf/include/c++/4.8.4/arm-linux-gnueabihf -fuse-ld=/home/servo/buildbot/slave/arm32/build/support/arm32/fake-ld.sh -Wno-error=unused-command-line-argument
EXPAT_LIB_DIR: /usr/lib/arm-linux-gnueabihf
HOST_CC: gcc-5
# test-tidy doesn't like empty strings
HOST_CFLAGS: --target=x86_64-unknown-linux-gnu
HOST_CXX: g++-5
# test-tidy doesn't like empty strings
HOST_CXXFLAGS: --target=x86_64-unknown-linux-gnu
LD: /usr/bin/arm-linux-gnueabihf-ld
OBJCOPY: /usr/bin/arm-linux-gnueabihf-objcopy
OBJDUMP: /usr/bin/arm-linux-gnueabihf-objdump
RANLIB: /usr/bin/arm-linux-gnueabihf-ranlib
STRIP: /usr/bin/arm-linux-gnueabihf-strip
>>>>>>> Move nightly magicleap build to taskcluster.
commands:
- ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force
- ./etc/ci/clean_build_artifacts.sh
<<<<<<< HEAD
- env -u OPENSSL_INCLUDE_DIR -u OPENSSL_LIB_DIR ./mach build --magicleap --release
- ./mach package --magicleap --release
- ./mach upload-nightly magicleap
=======
- env --unset CC_arm-unknown-linux-gnueabihf --unset CXX_arm-unknown-linux-gnueabihf ./mach build --rel --target=arm-unknown-linux-gnueabihf
>>>>>>> Move nightly magicleap build to taskcluster.
- bash ./etc/ci/lockfile_changed.sh
- ./etc/ci/clean_build_artifacts.sh

@@ -183,6 +222,7 @@ mac-rel-wpt3: []
android-nightly: []
windows-msvc-nightly: []
mac-nightly: []
magicleap-nightly: []
magicleap: []

# No longer maintained
@@ -94,6 +94,7 @@ def main(task_for):
windows_nightly()
macos_nightly()
update_wpt()
magicleap_nightly()


# These are disabled in a "real" decision task,
@@ -796,10 +797,10 @@ def macos_build_task(name):
)


def magicleap_dev():
def magicleap_build_task(name, build_type):
return (
macos_build_task("Dev build")
.with_treeherder("MagicLeap aarch64", "Release")
macos_build_task(name)
.with_treeherder("MagicLeap aarch64", build_type)
.with_curl_script(
"https://servo-deps.s3.amazonaws.com/magicleap/macos-sdk-v0.17.0.tar.gz",
"$HOME/magicleap_sdk.tar.gz"
@@ -816,9 +817,31 @@ def magicleap_dev():
.with_script("""
export OPENSSL_INCLUDE_DIR=
export OPENSSL_LIB_DIR=
""")
)


def magicleap_dev():
return (
magicleap_build_task("Dev build", "Debug")
.with_script("""
./mach build --magicleap --dev
./mach package --magicleap --dev
""")
)


def magicleap_nightly():
return (
magicleap_build_task("Nightly build and upload", "Release")
.with_features("taskclusterProxy")
.with_scopes("secrets:get:project/servo/s3-upload-credentials")
.with_script("""
./mach build --magicleap --release
./mach package --magicleap --release
"./mach upload-nightly magicleap --secret-from-taskcluster",
""")
)


CONFIG.task_name_template = "Servo: %s"

0 comments on commit c379560

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