manually use apt-get to install packages on bionic

diff --git a/.travis.yml b/.travis.yml
index 2f047343c99674046adf5118b6a68feec2dd061c..db36768848c46873a6877d578b95a49805a30fc6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,12 +24,6 @@ matrix:
     - os: linux\r
       dist: bionic\r
       compiler: gcc\r
-      addons:\r
-        apt:\r
-          packages:\r
-            - valgrind\r
-            - cppcheck\r
-            - doxygen\r
       env: CHECK="true"\r
     - os: linux\r
       dist: bionic\r
@@ -38,44 +32,32 @@ matrix:
 \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
+          sources:\r
+            - llvm-toolchain-xenial-5.0\r
           packages:\r
-            - clang-6.0\r
-            - cppcheck\r
-            - doxygen\r
-      env: CHECK="true"\r
-\r
-#   bionic\r
+            - clang-5.0\r
+      env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"\r
     - os: linux\r
-      dist: bionic\r
+      dist: \r
       compiler: clang\r
       addons:\r
         apt:\r
           sources:\r
-            - llvm-toolchain-bionic-5.0\r
+            - llvm-toolchain-xenial-6.0\r
           packages:\r
-            - clang-5.0\r
-      env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"\r
-    - os: linux\r
-      dist: bionic\r
-      compiler: clang\r
+            - clang-6.0\r
       env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" \r
-    \r
+\r
+# bionic\r
     # The default clang on bionic is clang 7.0\r
     - os: linux\r
       dist: bionic\r
       compiler: clang\r
-      addons:\r
-        apt:\r
-          packages:\r
-            - clang-6.0\r
-            - cppcheck\r
-            - doxygen\r
       env: CHECK="true"\r
 # osx\r
     - os: osx\r
@@ -108,9 +90,14 @@ before_script:
 \r
 script:\r
   - make\r
+  # when using bionic, Travis seems to ignore the "addons" section, so installing the packages with apt-get...\r
   - if [ -n "$CHECK" ]; then\r
       if [ "$TRAVIS_OS_NAME" = "osx" ]; then\r
         brew install doxygen;\r
+      else\r
+        if [ "$TRAVIS_DIST" = "bionic" ]; then\r
+          sudo apt-get install -y valgrind cppcheck doxygen;\r
+        fi;\r
       fi;\r
       make distcheck;\r
       if type cppcheck &> /dev/null ; then cppcheck --error-exitcode=1 --quiet *.h *.c tests/ ; fi;\r