From f3b9588a284e88a61a5369ee98d691eb551f9d41 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Sun, 17 Dec 2017 10:05:50 +0000
Subject: Mores to travis

---
 .travis.yml | 69 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 059afde1..7dfa3538 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,19 @@
 --- 
+addons: 
+  apt: 
+    packages: 
+      - g++-6
+      - g++-7
+      - libegl1-mesa-dev
+      - libgles2-mesa-dev
+      - libglm-dev
+      - xorg-dev
+      - libglu1-mesa-dev
+      - doxygen
+    sources: 
+      - ubuntu-toolchain-r-test
+before_install: 
+  - "eval \"${MATRIX_EVAL}\""
 branches: 
   only: 
     - master
@@ -6,53 +21,29 @@ branches:
 dist: trusty
 env: 
   global: 
-    secure: NGWn7hJAd/iYfJQmr8oDjTlwttldj8zB+X0gk2TqDhAJ2gLiZ2+b8Bp5FSzBlNIyhcbuhzRU+rzkbo03XSwXZXFRZK/gyPMGaB75ay8MLQBrN3L7THXbjQm1SZg2mO17/MKT+rJH/NvhmqPoUoJaYnoki1G6AZfhnDx+3bW4MNp5/g3u8trk1HNvXWTvjdqS99OH36bvoq8BsOi53Po1veeCIWza6JO61n2nRHzCC2sYWtsZyTQSi3B//iie5zF3gvuRorbzjA/ayc8lLmhUsTmoA1t9HJP52fKzv/q3mxllXzyzpWNRmUJCzf7I1wY9jp1FVwojfl0umofzYPCCjwSrKlRtmwQfi0peg7VOJVCCJx7Eh/i0hamGUnDEu0aZnfhgwzkqDDIgO1AwcEv5i9egt/73kK4mdm22sEDa3dWVu37tnj5dItaQesMm6TXKMy9+r7v0aaVJbQB2atvBaf3RlW71P9iy8mOZ+geKNwVFRuBdu5g3oQe5QrqXRi4inMv0bjN8HwOVs/f8ZTGZ ePnbHnxOnYRErxLnha/bsu7btfDT8Q8nmZ/Rhcu7QkMRNTm5L3+YHFUngiIygOs8wrH6HECtSYwmi9WejRuPgU2GnYR0Rzyi5dyaFok1iN+jsYsY9YFx5tRgxuX4H9CnUlfDabdFSLzqbmKRlbP79as=
+    secure: NGWn7hJAd/iYfJQmr8oDjTlwttldj8zB+X0gk2TqDhAJ2gLiZ2+b8Bp5FSzBlNIyhcbuhzRU+rzkbo03XSwXZXFRZK/gyPMGaB75ay8MLQBrN3L7THXbjQm1SZg2mO17/MKT+rJH/NvhmqPoUoJaYnoki1G6AZfhnDx+3bW4MNp5/g3u8trk1HNvXWTvjdqS99OH36bvoq8BsOi53Po1veeCIWza6JO61n2nRHzCC2sYWtsZyTQSi3B//iie5zF3gvuRorbzjA/ayc8lLmhUsTmoA1t9HJP52fKzv/q3mxllXzyzpWNRmUJCzf7I1wY9jp1FVwojfl0umofzYPCCjwSrKlRtmwQfi0peg7VOJVCCJx7Eh/i0hamGUnDEu0aZnfhgwzkqDDIgO1AwcEv5i9egt/73kK4mdm22sEDa3dWVu37tnj5dItaQesMm6TXKMy9+r7v0aaVJbQB2atvBaf3RlW71P9iy8mOZ+geKNwVFRuBdu5g3oQe5QrqXRi4inMv0bjN8HwOVs/f8ZTGZePnbHnxOnYRErxLnha/bsu7btfDT8Q8nmZ/Rhcu7QkMRNTm5L3+YHFUngiIygOs8wrH6HECtSYwmi9WejRuPgU2GnYR0Rzyi5dyaFok1iN+jsYsY9YFx5tRgxuX4H9CnUlfDabdFSLzqbmKRlbP79as=
 git: 
   depth: 1
-language: cpp
-matrix:
-    - 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"
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
-
-before_install:
-    - eval "${MATRIX_EVAL}"
+language: generic
+matrix: 
+  include: 
+    -
+      env: 
+        - "MATRIX_EVAL=\"CC=gcc-6 && CXX=g++-6\""
+      os: linux
+    -
+      env: 
+        - "MATRIX_EVAL=\"CC=gcc-7 && CXX=g++-7\""
+      os: linux
 notifications: 
   email: false
-script:
-  - "g++-7 --version"
+script: 
   - "g++-6 --version"
-  - "g++-5 --version"
+  - "g++-7 --version"
   - "cd $TRAVIS_BUILD_DIR"
   - "mkdir -p build"
   - "cd build"
-  - "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUNIT_TESTS=ON .."
+  - "cmake .."
   - make
   - ctest
   - "cd .. && ./scripts/update_docs"
-- 
cgit