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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Jan 29, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion mk/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mk/update-travis-yml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
],
"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",
Expand Down