remove is_unique

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b0d05655e24dfbfda5026851a07eb5351f310e12..b2840ac3121f84d3a48151d62828399986cf734e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,9 @@ matrix:
     - env: IMAGE=dist-x86_64-linux DEPLOY=1
       if: branch = try OR branch = auto
 
-    # "alternate" deployments, these are "nightlies" but don't have assertions
-    # turned on, they're deployed to a different location primarily for projects
-    # which are stuck on nightly and don't want llvm assertions in the artifacts
-    # that they use.
+    # "alternate" deployments, these are "nightlies" but have LLVM assertions
+    # turned on, they're deployed to a different location primarily for
+    # additional testing.
     - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
       if: branch = try OR branch = auto
 
@@ -113,9 +112,9 @@ matrix:
       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
@@ -169,7 +168,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