Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop using Salt-installed Android SDK on CI #21185

Merged
merged 1 commit into from Jul 18, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Stop using Salt-installed Android SDK on CI

  • Loading branch information
SimonSapin committed Jul 16, 2018
commit e38a45bdaac8997cab5f6490fdccbd1ef8d54e14
@@ -154,8 +154,9 @@ linux-nightly:
android:
- ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --dev
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --dev
- ./etc/ci/bootstrap-android-and-accept-licences.sh
- 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
- python ./etc/ci/check_dynamic_symbols.py

@@ -171,8 +172,9 @@ android-x86:
android-nightly:
- ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach build --android --release
- env ANDROID_SDK=/home/servo/android/sdk/r25.2.3 ./mach package --android --release
- ./etc/ci/bootstrap-android-and-accept-licences.sh
- 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

arm32:
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.