add tests on bionic beaver

diff --git a/.travis.yml b/.travis.yml
index 41d557ada628a005f5926c7a684a4305da5188a0..2f047343c99674046adf5118b6a68feec2dd061c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
 language: cpp\r
 matrix:\r
-# gcc\r
   include:\r
+# gcc\r
+#   xenial\r
+#   gcc 5 is the default on xenial\r
     - os: linux\r
       dist: xenial\r
       compiler: gcc\r
@@ -12,49 +14,69 @@ matrix:
             - cppcheck\r
             - doxygen\r
       env: CHECK="true"\r
+#   bionic\r
     - os: linux\r
-      dist: xenial\r
-      compiler: gcc\r
-    - os: linux\r
-      dist: xenial\r
+      dist: bionic\r
       compiler: gcc\r
       env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"\r
+    \r
+    # gcc 7 is the default on bionic\r
     - os: linux\r
-      dist: xenial\r
+      dist: bionic\r
       compiler: gcc\r
-      env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"\r
+      addons:\r
+        apt:\r
+          packages:\r
+            - valgrind\r
+            - cppcheck\r
+            - doxygen\r
+      env: CHECK="true"\r
     - os: linux\r
-      dist: xenial\r
+      dist: bionic\r
       compiler: gcc\r
       env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"\r
 \r
-# clang\r
+# clang      \r
+#   xenial\r
+#   The default clang on xenial is clang 7.0\r
     - os: linux\r
       dist: xenial\r
       compiler: clang\r
+      addons:\r
+        apt:\r
+          packages:\r
+            - clang-6.0\r
+            - cppcheck\r
+            - doxygen\r
+      env: CHECK="true"\r
+\r
+#   bionic\r
+    - os: linux\r
+      dist: bionic\r
+      compiler: clang\r
       addons:\r
         apt:\r
           sources:\r
-            - llvm-toolchain-xenial-5.0\r
+            - llvm-toolchain-bionic-5.0\r
           packages:\r
             - clang-5.0\r
       env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"\r
     - os: linux\r
-      dist: xenial\r
+      dist: bionic\r
+      compiler: clang\r
+      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" \r
+    \r
+    # The default clang on bionic is clang 7.0\r
+    - os: linux\r
+      dist: bionic\r
       compiler: clang\r
       addons:\r
         apt:\r
-          sources:\r
-            - llvm-toolchain-xenial-6.0\r
           packages:\r
             - clang-6.0\r
             - cppcheck\r
             - doxygen\r
-      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" CHECK="true"\r
-    # The default clang on xenial is clang 7.0\r
-    - os: linux\r
-      dist: xenial\r
-      compiler: clang\r
+      env: CHECK="true"\r
 # osx\r
     - os: osx\r
       osx_image: xcode9.4\r
@@ -77,9 +99,6 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then\r
       eval "${MATRIX_EVAL}";\r
       if [ -n "$MATRIX_EVAL" ] && [ "$TRAVIS_COMPILER" != "clang" ]; then\r
-        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157;\r
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;\r
-        sudo apt-get update -qq;\r
         sudo apt-get install -y $CC;\r
       fi;\r
     fi\r