summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryant Mairs <bryant@mai.rs>2017-06-30 10:25:57 -0700
committerBryant Mairs <bryant@mai.rs>2017-06-30 22:01:59 -0700
commit38e831817576aa05eb90acfec66a8011c7974007 (patch)
treef52fed5c872f5d37d83ed3ef7116c94af52d6ef9
parent274b09eee1cdac51ceea9238d2e584babae48720 (diff)
downloadnix-38e831817576aa05eb90acfec66a8011c7974007.zip
Add all Android targets as Tier 3 platforms
-rw-r--r--.travis.yml26
-rw-r--r--README.md10
2 files changed, 34 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 3c63f12a..6d0b82d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,18 @@ matrix:
# These are all the build jobs. Adjust as necessary. Comment out what you
# don't need
include:
+ # Android
+ - env: TARGET=aarch64-linux-android DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=i686-linux-android DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=x86_64-linux-android DISABLE_TESTS=1
+ rust: 1.13.0
+
# Linux
- env: TARGET=aarch64-unknown-linux-gnu
rust: 1.13.0
@@ -74,9 +86,19 @@ matrix:
os: osx
rust: nightly
- # Testing nightlies on main targets. These might fail because of issues
- # with the compiler, so we allow failures here.
allow_failures:
+ # Android (in the process of fixing these, so they're allowed to fail for now)
+ - env: TARGET=aarch64-linux-android DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=i686-linux-android DISABLE_TESTS=1
+ rust: 1.13.0
+ - env: TARGET=x86_64-linux-android DISABLE_TESTS=1
+ rust: 1.13.0
+
# Failures for nightlies may be because of compiler bugs, so don't fail the
# build if these fail.
- env: TARGET=x86_64-unknown-linux-gnu
diff --git a/README.md b/README.md
index 885ab0bf..437aa25c 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,9 @@ limitations. Support for platforms is split into two tiers:
* Tier 2 - Builds for this target are run in CI. Failures during the build
blocks the inclusion of new code. Tests may be run, but failures
in tests don't block the inclusion of new code.
+ * Tier 3 - Builds for this target are run in CI. Failures during the build
+ *do not* block the inclusion of new code. Testing may be run, but
+ failures in tests don't block the inclusion of new code.
The following targets are all supported by nix on Rust 1.13.0 or newer:
@@ -66,6 +69,13 @@ Tier 2:
* i686-unknown-freebsd
* x86_64-unknown-netbsd
+Tier 3:
+ * aarch64-linux-android
+ * arm-linux-androideabi
+ * armv7-linux-androideabi
+ * i686-linux-android
+ * x86_64-linux-android
+
## Usage
To use `nix`, first add this to your `Cargo.toml`: