Work around problem retrieving the clang 3.7 package in Travis CI.

.travis.yml

@@ -9,18 +9,18 @@ matrix:
     #
     # BEGIN GENERATED
 
-    - env: CLANG_VERSION=3.7 CMAKE_BUILD_TYPE=DEBUG ARCH=x86
+    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=DEBUG ARCH=x86
       os: linux
       addons:
         apt:
           packages:
-            - clang-3.7
+            - clang-3.6
             - g++-multilib
             - gcc-multilib
             - libc6-dev-i386
             - yasm
           sources:
-            - llvm-toolchain-precise
+            - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
 
     - env: GCC_VERSION=4.8 CMAKE_BUILD_TYPE=DEBUG ARCH=x86
@@ -37,20 +37,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=DEBUG ARCH=x86
-      os: linux
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-            - g++-multilib
-            - gcc-multilib
-            - libc6-dev-i386
-            - yasm
-          sources:
-            - llvm-toolchain-precise-3.6
-            - ubuntu-toolchain-r-test
-
     - env: CLANG_VERSION=3.5 CMAKE_BUILD_TYPE=DEBUG ARCH=x86
       os: linux
       addons:
@@ -91,15 +77,15 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.7 CMAKE_BUILD_TYPE=DEBUG ARCH=x86_64
+    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=DEBUG ARCH=x86_64
       os: linux
       addons:
         apt:
           packages:
-            - clang-3.7
+            - clang-3.6
             - yasm
           sources:
-            - llvm-toolchain-precise
+            - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
 
     - env: GCC_VERSION=4.8 CMAKE_BUILD_TYPE=DEBUG ARCH=x86_64
@@ -113,17 +99,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=DEBUG ARCH=x86_64
-      os: linux
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-            - yasm
-          sources:
-            - llvm-toolchain-precise-3.6
-            - ubuntu-toolchain-r-test
-
     - env: CLANG_VERSION=3.5 CMAKE_BUILD_TYPE=DEBUG ARCH=x86_64
       os: linux
       addons:
@@ -164,18 +139,18 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.7 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86
+    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86
       os: linux
       addons:
         apt:
           packages:
-            - clang-3.7
+            - clang-3.6
             - g++-multilib
             - gcc-multilib
             - libc6-dev-i386
             - yasm
           sources:
-            - llvm-toolchain-precise
+            - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
 
     - env: GCC_VERSION=4.8 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86
@@ -192,20 +167,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86
-      os: linux
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-            - g++-multilib
-            - gcc-multilib
-            - libc6-dev-i386
-            - yasm
-          sources:
-            - llvm-toolchain-precise-3.6
-            - ubuntu-toolchain-r-test
-
     - env: CLANG_VERSION=3.5 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86
       os: linux
       addons:
@@ -246,15 +207,15 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.7 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86_64
+    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86_64
       os: linux
       addons:
         apt:
           packages:
-            - clang-3.7
+            - clang-3.6
             - yasm
           sources:
-            - llvm-toolchain-precise
+            - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
 
     - env: GCC_VERSION=4.8 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86_64
@@ -268,17 +229,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - env: CLANG_VERSION=3.6 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86_64
-      os: linux
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-            - yasm
-          sources:
-            - llvm-toolchain-precise-3.6
-            - ubuntu-toolchain-r-test
-
     - env: CLANG_VERSION=3.5 CMAKE_BUILD_TYPE=RELWITHDEBINFO ARCH=x86_64
       os: linux
       addons:
@@ -332,7 +282,6 @@ before_script:
   - $CXX --version
   - go version
   - make --version
-  - yasm --version
 
 script:
   - make -j2

mk/update-travis-yml.py

@@ -23,11 +23,14 @@ compilers = [
     # Since Travis CI limits the number of concurrent builds, we put the
     # highest-signal (most likely to break) builds first, to reduce latency
     # in discovering broken builds.
-    latest_clang, # Newest clang first.
+    #
+    # XXX TODO: clang-3.7 was available and working using this setup, but for
+    # some reason it isn't working any more as of 2015-07-24, so it has been
+    # removed from the matrix for now.
+    "clang-3.6", # Newest clang first.
     "gcc-4.8",   # Oldest GCC next.
 
     # All other clang versions, newest to oldest.
-    "clang-3.6",
     "clang-3.5",
     "clang-3.4",