Skip to content

Commit b3f5424

Browse files
committed
Merge #639
639: Add all Android targets as Tier 3 platforms r=Susurrus cc @ndusart @roblabla
2 parents 273ecea + 38e8318 commit b3f5424

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

.travis.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ matrix:
1515
# These are all the build jobs. Adjust as necessary. Comment out what you
1616
# don't need
1717
include:
18+
# Android
19+
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
20+
rust: 1.13.0
21+
- env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
22+
rust: 1.13.0
23+
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
24+
rust: 1.13.0
25+
- env: TARGET=i686-linux-android DISABLE_TESTS=1
26+
rust: 1.13.0
27+
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
28+
rust: 1.13.0
29+
1830
# Linux
1931
- env: TARGET=aarch64-unknown-linux-gnu
2032
rust: 1.13.0
@@ -74,9 +86,19 @@ matrix:
7486
os: osx
7587
rust: nightly
7688

77-
# Testing nightlies on main targets. These might fail because of issues
78-
# with the compiler, so we allow failures here.
7989
allow_failures:
90+
# Android (in the process of fixing these, so they're allowed to fail for now)
91+
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
92+
rust: 1.13.0
93+
- env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
94+
rust: 1.13.0
95+
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
96+
rust: 1.13.0
97+
- env: TARGET=i686-linux-android DISABLE_TESTS=1
98+
rust: 1.13.0
99+
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
100+
rust: 1.13.0
101+
80102
# Failures for nightlies may be because of compiler bugs, so don't fail the
81103
# build if these fail.
82104
- env: TARGET=x86_64-unknown-linux-gnu

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ limitations. Support for platforms is split into two tiers:
4242
* Tier 2 - Builds for this target are run in CI. Failures during the build
4343
blocks the inclusion of new code. Tests may be run, but failures
4444
in tests don't block the inclusion of new code.
45+
* Tier 3 - Builds for this target are run in CI. Failures during the build
46+
*do not* block the inclusion of new code. Testing may be run, but
47+
failures in tests don't block the inclusion of new code.
4548

4649
The following targets are all supported by nix on Rust 1.13.0 or newer:
4750

@@ -66,6 +69,13 @@ Tier 2:
6669
* i686-unknown-freebsd
6770
* x86_64-unknown-netbsd
6871

72+
Tier 3:
73+
* aarch64-linux-android
74+
* arm-linux-androideabi
75+
* armv7-linux-androideabi
76+
* i686-linux-android
77+
* x86_64-linux-android
78+
6979
## Usage
7080

7181
To use `nix`, first add this to your `Cargo.toml`:

0 commit comments

Comments
 (0)