yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armv7-linux-androideabi: Re-enable CI/CD except for running tests in the emulator.

Browse Source
This commit is contained in:
Brian Smith 2020-01-29 14:17:21 -06:00
parent 8b4ea6a596
commit cd2c7cc1cc
3 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.travis.yml
View File

@ -45,6 +45,28 @@ matrix:
- build-tools-26.0.2
dist: trusty
- env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=stable
rust: stable
os: linux
language: android
android:
components:
- android-18
- build-tools-26.0.2
- sys-img-armeabi-v7a-android-18
dist: trusty
- env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=stable
rust: stable
os: linux
language: android
android:
components:
- android-18
- build-tools-26.0.2
- sys-img-armeabi-v7a-android-18
dist: trusty
- env: TARGET_X=x86_64-unknown-linux-gnu FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=stable
rust: stable
os: linux
@ -239,6 +261,28 @@ matrix:
- build-tools-26.0.2
dist: trusty
- env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=nightly
rust: nightly
os: linux
language: android
android:
components:
- android-18
- build-tools-26.0.2
- sys-img-armeabi-v7a-android-18
dist: trusty
- env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=nightly
rust: nightly
os: linux
language: android
android:
components:
- android-18
- build-tools-26.0.2
- sys-img-armeabi-v7a-android-18
dist: trusty
- env: TARGET_X=x86_64-unknown-linux-gnu FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=nightly
rust: nightly
os: linux
@ -448,6 +492,28 @@ matrix:
- build-tools-26.0.2
dist: trusty
- env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=beta
rust: beta
os: linux
language: android
android:
components:
- android-18
- build-tools-26.0.2
- sys-img-armeabi-v7a-android-18
dist: trusty
- env: TARGET_X=armv7-linux-androideabi CC_X=armv7a-linux-androideabi18-clang FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0 RUST_X=beta
rust: beta
os: linux
language: android
android:
components:
- android-18
- build-tools-26.0.2
- sys-img-armeabi-v7a-android-18
dist: trusty
- env: TARGET_X=x86_64-unknown-linux-gnu FEATURES_X= MODE_X=DEBUG KCOV=0 RUST_X=beta
rust: beta
os: linux

6
mk/travis.sh
View File

@ -27,10 +27,14 @@ arm-unknown-linux-gnueabihf)
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
;;
aarch64-linux-android)
# XXX: Tests are built but not run because we couldn't get the emulator to work; see
# https://github.com/briansmith/ring/issues/838
export ANDROID_ABI=aarch64
;;
armv7-linux-androideabi)
export ANDROID_SYSTEM_IMAGE="system-images;android-18;default;armeabi-v7a"
# XXX: Tests are built but not run because we couldn't get the emulator to work; see
# https://github.com/briansmith/ring/issues/838
# export ANDROID_SYSTEM_IMAGE="system-images;android-18;default;armeabi-v7a"
export ANDROID_ABI=armeabi-v7a
;;
esac

2
mk/update-travis-yml.py
View File

@ -73,7 +73,7 @@ targets = {
],
"linux" : [
"aarch64-linux-android",
# TODO: Emulator is broken "armv7-linux-androideabi",
"armv7-linux-androideabi",
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
"i686-unknown-linux-gnu",