Rollup merge of #38623 - alexcrichton:less-osx-warnings, r=aturon

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 915d0bb535b6d239a88f5a91f896810308372a18..2b5eaecb0b42c48a108b119cf9ed9a2247dc21b8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,17 +15,19 @@ matrix:
     # Linux builders, all docker images
     - env: IMAGE=arm-android
     - env: IMAGE=cross
+    - env: IMAGE=dist-arm-unknown-linux-gnueabi
+    - env: IMAGE=dist-x86_64-unknown-freebsd
     - env: IMAGE=i686-gnu
     - env: IMAGE=i686-gnu-nopt
-    - env: IMAGE=x86_64-freebsd
     - env: IMAGE=x86_64-gnu
     - env: IMAGE=x86_64-gnu-full-bootstrap
-    - env: IMAGE=x86_64-gnu-cargotest
+    - env: IMAGE=x86_64-gnu-aux
     - env: IMAGE=x86_64-gnu-debug
     - env: IMAGE=x86_64-gnu-nopt
     - env: IMAGE=x86_64-gnu-make
     - env: IMAGE=x86_64-gnu-llvm-3.7 ALLOW_PR=1 RUST_BACKTRACE=1
     - env: IMAGE=x86_64-musl
+    - env: IMAGE=x86_64-gnu-distcheck
 
     # OSX builders
     - env: >
@@ -67,10 +69,10 @@ script:
       if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
           echo skipping, not a full build;
       elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-          git submodule update --init;
+          travis_retry git submodule update --init &&
           src/ci/run.sh;
       else
-          git submodule update --init;
+          travis_retry git submodule update --init &&
           src/ci/docker/run.sh $IMAGE;
       fi