Stop using Salt-installed Android SDK on CI

This commit is contained in:
Simon Sapin 2018-07-16 15:10:21 +02:00
parent a6f403c5f2
commit e38a45bdaa

View file

@ -154,8 +154,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: