summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryant Mairs <bryantmairs@google.com>2017-12-08 08:21:44 -0800
committerBryant Mairs <bryantmairs@google.com>2017-12-08 17:55:17 -0800
commitea0952f4783c961af0419430014a6b49ea35f981 (patch)
treeb2ac6c8354099dd47adb9c2a29f3fe304a6f4cd6
parent112dca300c2e4a15c99b8d92963c370d0ac0c693 (diff)
downloadnix-ea0952f4783c961af0419430014a6b49ea35f981.zip
Run all iOS builds on a single run
-rw-r--r--.travis.yml40
1 files changed, 18 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index 69c2cde0..04046aa9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,24 @@ matrix:
# likes to have a big backlog on builds on those machines. This way at least
# all of the other jobs can finish while waiting on those builds.
include:
+ # iOS builds
+ # These are all done on a single machine because Travis rations their OS X
+ # builders so heavily that we otherwise can't merge PRs during the work week.
+ # Additionally they're moved to the front of the line to get them in the Travis
+ # OS X build queue first.
+ - env: TARGET="aarch64-apple-ios;armv7-apple-ios;armv7s-apple-ios;i386-apple-ios;x86_64-apple-ios" DISABLE_TESTS=1
+ rust: 1.20.0
+ os: osx
+
+ # Mac builds
+ # These are also moved to be first because they wait in a long queue with Travis
+ - env: TARGET=i686-apple-darwin
+ rust: 1.20.0
+ os: osx
+ - env: TARGET=x86_64-apple-darwin
+ rust: 1.20.0
+ os: osx
+
# Android
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
rust: 1.20.0
@@ -23,9 +41,6 @@ matrix:
rust: 1.20.0
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
rust: 1.20.0
- - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
- rust: 1.20.0
- os: osx
- env: TARGET=i686-linux-android DISABLE_TESTS=1
rust: 1.20.0
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
@@ -34,45 +49,30 @@ matrix:
# Linux
- env: TARGET=aarch64-unknown-linux-gnu
rust: 1.20.0
- - env: TARGET=armv7-apple-ios DISABLE_TESTS=1
- rust: 1.20.0
- os: osx
- env: TARGET=arm-unknown-linux-gnueabi
rust: 1.20.0
- env: TARGET=arm-unknown-linux-musleabi DISABLE_TESTS=1
rust: 1.20.0
- env: TARGET=armv7-unknown-linux-gnueabihf
rust: 1.20.0
- - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
- rust: 1.20.0
- os: osx
- env: TARGET=i686-unknown-linux-gnu
rust: 1.20.0
- env: TARGET=i686-unknown-linux-musl
rust: 1.20.0
- env: TARGET=mips-unknown-linux-gnu
rust: 1.20.0
- - env: TARGET=i386-apple-ios DISABLE_TESTS=1
- rust: 1.20.0
- os: osx
- env: TARGET=mips64-unknown-linux-gnuabi64
rust: 1.20.0
- env: TARGET=mips64el-unknown-linux-gnuabi64
rust: 1.20.0
- env: TARGET=mipsel-unknown-linux-gnu
rust: 1.20.0
- - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
- rust: 1.20.0
- os: osx
- env: TARGET=powerpc-unknown-linux-gnu DISABLE_TESTS=1
rust: 1.20.0
- env: TARGET=powerpc64-unknown-linux-gnu
rust: 1.20.0
- env: TARGET=powerpc64le-unknown-linux-gnu
rust: 1.20.0
- - env: TARGET=i686-apple-darwin
- rust: 1.20.0
- os: osx
- env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
rust: 1.20.0
- env: TARGET=x86_64-unknown-linux-gnu
@@ -89,10 +89,6 @@ matrix:
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
rust: 1.20.0
- - env: TARGET=x86_64-apple-darwin
- rust: 1.20.0
- os: osx
-
# Make sure stable is always working too
- env: TARGET=x86_64-unknown-linux-gnu
rust: stable