Update Travis config to support more compilers

deanberris · deanberris · commit 0a6f0dc82172 · 2019-01-04T16:10:52.000+11:00
This change allows us to get more compilers and eventually more
platforms being tested.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 sudo: false
+dist: trusty
 language: cpp
+os:
+- linux
 compiler:
 - g++
 - clang
@@ -21,6 +24,73 @@ cache:
   - apt
   - ccache
 matrix:
+  include:
+    # GCC configurations
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env:
+        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env:
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      env:
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+    # Clang configurations
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
+      env:
+        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-3.9
+          packages:
+            - clang-3.9
+      env:
+        - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-4.0
+          packages:
+            - clang-4.0
+      env:
+        - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - clang-5.0
+      env:
+        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
   exclude:
     - compiler: g++
       env: BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread" Uri_BUILD_TEST=OFF Uri_DISABLE_LIBCXX=YES
@@ -29,19 +99,12 @@ matrix:
 # TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
 #    - compiler: g++
 #      env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
+before_install:
+- eval "${MATRIX_EVAL}"
 install:
 - pwd
 - export CUR_DIR=`pwd`
 - mkdir -p ${CUR_DIR}/bin
-- if [ "${CC}" = "gcc" ]; then
-  export CXX=g++-4.9;
-  export CC=gcc-4.9;
-  fi
-- if [ "${CC}" = "clang" ]; then
-  export CXX=clang++-3.8;
-  export CC=clang-3.8;
-  export CCACHE_CPP2=yes;
-  fi
 before_script:
 - echo ${CXX}
 - "${CXX} --version"
@@ -55,13 +118,11 @@ after_failure:
 addons:
   apt:
     sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.8
       - kalakris-cmake
       - boost-latest
       - george-edison55-precise-backports
     packages:
-      - libboost1.55-all-dev
+      - libboost-all-dev
       - gcc-4.9
       - g++-4.9
       - clang-3.8
