extended dt with kbd tags

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 320759b923373762a24372e39ec58f17ac1e154e..d0f1dbcfd3c9afdea237b33b7cb0bf0b53a310cf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: shell
 sudo: required
 dist: trusty
+group: deprecated-2017Q4
 services:
   - docker
 
@@ -24,8 +25,6 @@ matrix:
     - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
       if: branch = try OR branch = auto
 
-    # FIXME: The macOS dist images are temporarily disabled until Travis bug is fixed
-    # https://github.com/travis-ci/travis-ci/issues/8821
     - env: >
         RUST_CHECK_TARGET=dist
         RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler"
@@ -38,7 +37,7 @@ matrix:
         NO_DEBUG_ASSERTIONS=1
       os: osx
       osx_image: xcode7.3
-      if: branch = disabled
+      if: branch = auto
 
     # macOS builders. These are placed near the beginning because they are very
     # slow to run.
@@ -93,7 +92,7 @@ matrix:
         NO_DEBUG_ASSERTIONS=1
       os: osx
       osx_image: xcode7.3
-      if: branch = disabled
+      if: branch = auto
 
     - env: >
         RUST_CHECK_TARGET=dist
@@ -107,16 +106,16 @@ matrix:
         NO_DEBUG_ASSERTIONS=1
       os: osx
       osx_image: xcode7.3
-      if: branch = disabled
+      if: branch = auto
 
     # Linux builders, remaining docker images
     - env: IMAGE=arm-android
       if: branch = auto
     - env: IMAGE=armhf-gnu
       if: branch = auto
-    - env: IMAGE=cross DEPLOY=1
+    - env: IMAGE=dist-various-1 DEPLOY=1
       if: branch = auto
-    - env: IMAGE=cross2 DEPLOY=1
+    - env: IMAGE=dist-various-2 DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-aarch64-linux DEPLOY=1
       if: branch = auto
@@ -170,7 +169,7 @@ matrix:
       if: branch = auto
     - env: IMAGE=x86_64-gnu-aux
       if: branch = auto
-    - env: IMAGE=x86_64-gnu-cargotest
+    - env: IMAGE=x86_64-gnu-tools
       if: branch = auto
     - env: IMAGE=x86_64-gnu-debug
       if: branch = auto
@@ -295,6 +294,7 @@ before_deploy:
           cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
       fi
   - travis_retry gem update --system
+  - ls -la deploy/$TRAVIS_COMMIT
 
 deploy:
   - provider: s3