From 5651680bbde34de2713d06e868416145e269cb7c Mon Sep 17 00:00:00 2001
From: Mario Trangoni <mjtrangoni@gmail.com>
Date: Sun, 10 Jun 2018 18:22:45 +0200
Subject: travis.yml: refactor some config options, add gcc-8 and clang-6.0.

---
 .travis.yml | 75 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 22 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 3f36340fe..bc684b578 100644
--- 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,28 +56,45 @@ 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}"
+   - eval "${MATRIX_EVAL}"
 script:
    # run static analysis tools
    - ./run-static-analysis.sh
-- 
cgit v1.2.3