servo: Merge #17107 - Revert "Auto merge of #16566" (from servo:android); r=larsbergstrom
authorAnthony Ramine <n.oxyde@gmail.com>
Wed, 31 May 2017 07:14:39 -0500
changeset 409609 a83ba599156760899b493db426eab7c8e8cbe981
parent 409608 c5f7de87eceb7462a0461f644f314a34a473aa72
child 409610 8fb7e770d89f935ed0c7a13792f0fd8a582a0434
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslarsbergstrom
bugs17107, 16566
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #17107 - Revert "Auto merge of #16566" (from servo:android); r=larsbergstrom Source-Repo: https://github.com/servo/servo Source-Revision: c018340a138849b9b3552fed159fdde9b2be9697
servo/etc/ci/buildbot_steps.yml
--- a/servo/etc/ci/buildbot_steps.yml
+++ b/servo/etc/ci/buildbot_steps.yml
@@ -106,26 +106,26 @@ linux-rel-css:
 linux-nightly:
   - ./mach clean-nightlies --keep 3 --force
   - ./mach build --release
   - ./mach package --release
   - ./mach upload-nightly linux
 
 android:
   - ./mach clean-nightlies --keep 3 --force
-  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --dev
-  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach package --android --dev
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --dev
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --dev
   - bash ./etc/ci/lockfile_changed.sh
   - bash ./etc/ci/manifest_changed.sh
   - python ./etc/ci/check_dynamic_symbols.py
 
 android-nightly:
   - ./mach clean-nightlies --keep 3 --force
-  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --android --release
-  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach package --android --release
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --release
+  - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --release
   - ./mach upload-nightly android
 
 arm32:
   - ./mach clean-nightlies --keep 3 --force
   - env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --rel --target=arm-unknown-linux-gnueabihf
   - bash ./etc/ci/lockfile_changed.sh
   - bash ./etc/ci/manifest_changed.sh