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

Auto merge of #21185 - servo:bootstrapped-android, r=paulrouget

Browse source 
Stop using Salt-installed Android SDK on CI

<!-- 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/21185)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-07-18 08:38:37 -04:00 • committed by GitHub
commit d25bd95d6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
etc/ci/buildbot_steps.yml
View file

@ -155,8 +155,9 @@ linux-nightly:
android: android:
- ./mach clean-nightlies --keep 3 --force - ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force - ./mach clean-cargo-cache --keep 3 --force
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --dev - ./etc/ci/bootstrap-android-and-accept-licences.sh
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --dev - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --android --dev
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach package --android --dev
- bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/lockfile_changed.sh
- python ./etc/ci/check_dynamic_symbols.py - python ./etc/ci/check_dynamic_symbols.py
@ -171,8 +172,9 @@ android-x86:
android-nightly: android-nightly:
- ./mach clean-nightlies --keep 3 --force - ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force - ./mach clean-cargo-cache --keep 3 --force
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --release - ./etc/ci/bootstrap-android-and-accept-licences.sh
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --release - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach package --android --release
- ./mach upload-nightly android - ./mach upload-nightly android
arm32: arm32: