travis.yml: refactor some config options, add gcc-8 and clang-6.0.

5651680b · Mario Trangoni · Mike Gabriel · 913fcf1a · 5651680b
Commit 5651680b authored Jun 10, 2018 by Mario Trangoni Committed by Mike Gabriel Jul 03, 2018
Show whitespace changes
Inline Side-by-side

Showing with 52 additions and 21 deletions

.travis.yml .travis.yml +52 -21

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,20 @@ matrix:
      addons:
        apt:
          sources:
+            - sourceline: 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
            - ubuntu-toolchain-r-test
+          packages:
+            - cppcheck/trusty-backports
+            # imake
+            - xutils-dev
+            # X11 libaries
+            - libxcomposite-dev
+            - libxfont-dev
+            - libxinerama-dev
+            - libxrandr-dev
+            - libxtst-dev
+            - x11proto-fonts-dev
+
      env:
        - MATRIX_EVAL="CC=gcc && CXX=g++"
        - STATIC_ANALYSIS="yes"
@@ -21,19 +34,20 @@ matrix:
          sources:
            - ubuntu-toolchain-r-test
          packages:
-            - g++-4.9
-      env:
-        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+            - g++-8
+            # imake
+            - xutils-dev
+            # X11 libaries
+            - libxcomposite-dev
+            - libxfont-dev
+            - libxinerama-dev
+            - libxrandr-dev
+            - libxtst-dev
+            - x11proto-fonts-dev

-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
      env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+        - STATIC_ANALYSIS="no"

    - os: linux
      addons:
@@ -42,27 +56,44 @@ matrix:
            - llvm-toolchain-trusty-3.9
          packages:
            - clang-3.9
+            # imake
+            - xutils-dev
+            # X11 libaries
+            - libxcomposite-dev
+            - libxfont-dev
+            - libxinerama-dev
+            - libxrandr-dev
+            - libxtst-dev
+            - x11proto-fonts-dev
+
      env:
        - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
+        - STATIC_ANALYSIS="no"

    - os: linux
      addons:
        apt:
          sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            - ubuntu-toolchain-r-test
          packages:
-            - clang-5.0
+            - clang-6.0
+            - g++-4.9
+            # imake
+            - xutils-dev
+            # X11 libaries
+            - libxcomposite-dev
+            - libxfont-dev
+            - libxinerama-dev
+            - libxrandr-dev
+            - libxtst-dev
+            - x11proto-fonts-dev
+
      env:
-        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+        - MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
+        - STATIC_ANALYSIS="no"

 before_install:
-  - sudo apt-get update -qq
-  # cppcheck tool
-  - sudo apt-get install -y cppcheck/trusty-backports
-  # imake
-  - sudo apt-get install -y xutils-dev
-  # X11 libaries
-  - sudo apt-get install -y libxcomposite-dev libxfont-dev libxinerama-dev libxrandr-dev libxtst-dev x11proto-fonts-dev
   - eval "${MATRIX_EVAL}"
 script:
   # run static analysis tools