travis: re-enable LLVM apt repo

quixdb · Jun 23, 2016 · 025a424 · 025a424
1 parent f4e67da
commit 025a424
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # This script only exists to support Travis CI, since (AFAICT) it is
 # not possible to perform different before_install steps depending on
@@ -66,26 +66,25 @@ case "${1}" in
             "linux")
                 . /etc/lsb-release
 
-                sudo apt-get update -qq
-                sudo apt-get install -qq python-software-properties
-                sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
-
                 sudo apt-get update -qq
                 sudo apt-get install -qq \
                      cmake \
                      build-essential \
-                     libglib2.0-dev \
                      gdb \
-                     ragel
+                     ragel \
+                     python-software-properties
 
                 case "${COMPILER}" in
                     "gcc-"*)
+                        sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
+                        sudo apt-get update -qq
                         sudo apt-get install -qq gcc-${COMPILER#*-} g++-${COMPILER#*-}
                         ;;
                     "clang-"*)
                         sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AF4F7421
                         sudo apt-add-repository -y \
                              "deb http://llvm.org/apt/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-${COMPILER#*-} main"
+                        sudo apt-get update -qq
                         sudo apt-get install -qq "${COMPILER}"
                         ;;
                     "x86_64-w64-mingw32-gcc")

diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ env:
   matrix:
     # Latest versions of each compiler
     - COMPILER=gcc-6 BUILD_TYPE=debug
-    - COMPILER=clang BUILD_TYPE=debug
+    - COMPILER=clang-3.8 BUILD_TYPE=debug
     - COMPILER=x86_64-w64-mingw32-gcc BUILD_TYPE=debug
     - COMPILER=i686-w64-mingw32-gcc BUILD_TYPE=debug
     - COMPILER=icc BUILD_TYPE=debug
@@ -32,12 +32,10 @@ env:
     - COMPILER=gcc-4.8 BUILD_TYPE=debug
     - COMPILER=gcc-4.9 BUILD_TYPE=debug
     - COMPILER=gcc-5 BUILD_TYPE=debug
-    # Offline until http://llvm.org/apt/ comes back :(
-    # - COMPILER=clang-3.4 BUILD_TYPE=debug
-    # - COMPILER=clang-3.5 BUILD_TYPE=debug
-    # - COMPILER=clang-3.6 BUILD_TYPE=debug
-    # - COMPILER=clang-3.7 BUILD_TYPE=debug
-    # - COMPILER=clang-3.8 BUILD_TYPE=debug
+    - COMPILER=clang-3.4 BUILD_TYPE=debug
+    - COMPILER=clang-3.5 BUILD_TYPE=debug
+    - COMPILER=clang-3.6 BUILD_TYPE=debug
+    - COMPILER=clang-3.7 BUILD_TYPE=debug
 
     # Coverage analysis
     - COMPILER=gcc-6 BUILD_TYPE=coverage
@@ -51,8 +49,6 @@ env:
 matrix:
   exclude:
     # Limit OS X to 1 debug and 1 release build.
-    - os: osx
-      env: COMPILER=clang BUILD_TYPE=debug
     - os: osx
       env: COMPILER=x86_64-w64-mingw32-gcc BUILD_TYPE=debug
     - os: osx
@@ -67,6 +63,8 @@ matrix:
       env: COMPILER=gcc-6 BUILD_TYPE=tsan
     - os: osx
       env: COMPILER=clang BUILD_TYPE=release
+    - os: osx
+      env: COMPILER=clang BUILD_TYPE=release
     - os: osx
       env: COMPILER=gcc-4.6 BUILD_TYPE=debug
     - os: osx
@@ -75,6 +73,8 @@ matrix:
       env: COMPILER=gcc-4.8 BUILD_TYPE=debug
     - os: osx
       env: COMPILER=gcc-4.9 BUILD_TYPE=debug
+    - os: osx
+      env: COMPILER=gcc-5 BUILD_TYPE=debug
     - os: osx
       env: COMPILER=clang-3.4 BUILD_TYPE=debug
     - os: osx