From 0ac42fb77773e15b13f1ede01dd1efd920a8fb9b Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Sat, 23 Dec 2017 01:08:45 +0000
Subject: [Travis] Fixing build and removing dependencies.

---
 .travis.yml          | 36 +++++++-----------------------------
 scripts/travis_build |  8 ++++++--
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cc4da23..2ccfb4a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,9 @@ env:
     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
+install:
+  - "sudo apt-get -qq update"
+  - "sudo apt-get install -y libegl1-mesa-dev xorg-dev doxygen"
 language: cpp
 matrix:
   include:
@@ -19,11 +22,6 @@ matrix:
         apt:
           packages:
             - g++-5
-            - libegl1-mesa-dev
-            - libgles2-mesa-dev
-            - xorg-dev
-            - libglu1-mesa-dev
-            - doxygen
           sources:
             - ubuntu-toolchain-r-test
       compiler: g++-5
@@ -35,11 +33,6 @@ matrix:
         apt:
           packages:
             - g++-6
-            - libegl1-mesa-dev
-            - libgles2-mesa-dev
-            - xorg-dev
-            - libglu1-mesa-dev
-            - doxygen
           sources:
             - ubuntu-toolchain-r-test
       compiler: g++-6
@@ -51,16 +44,12 @@ matrix:
         apt:
           packages:
             - g++-7
-            - libegl1-mesa-dev
-            - libgles2-mesa-dev
-            - xorg-dev
-            - libglu1-mesa-dev
-            - doxygen
           sources:
             - ubuntu-toolchain-r-test
       compiler: g++-7
       env:
-        - "MATRIX_EVAL=\"CC=gcc-7 && CXX=g++-7 && BUILD_DOCS=1\""
+        - "MATRIX_EVAL=\"CC=gcc-7 && CXX=g++-7\""
+        - BUILD_DOCS=1
       os: linux
     -
       addons:
@@ -68,11 +57,6 @@ matrix:
           packages:
             - g++-7
             - clang-4.0
-            - libegl1-mesa-dev
-            - libgles2-mesa-dev
-            - xorg-dev
-            - libglu1-mesa-dev
-            - doxygen
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-4.0
@@ -86,11 +70,6 @@ matrix:
           packages:
             - g++-7
             - clang-5.0
-            - libegl1-mesa-dev
-            - libgles2-mesa-dev
-            - xorg-dev
-            - libglu1-mesa-dev
-            - doxygen
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-5.0
@@ -101,6 +80,5 @@ matrix:
 notifications:
   email: false
 script:
-  - "./scripts/travis_build"
-
-
+  - ./scripts/travis_build
+sudo: required
diff --git a/scripts/travis_build b/scripts/travis_build
index 140580a9..ed2fdd0a 100755
--- a/scripts/travis_build
+++ b/scripts/travis_build
@@ -17,6 +17,11 @@ ctest
 cd ../..
 
 # update docs if we are on the master branch
+echo "TRAVIS_BRANCH = " $TRAVIS_BRANCH
+echo "BUILD_DOCS    = " $BUILD_DOCS
+echo "CC            = " $CC
+echo "CXX           = " $CXX
+
 if [[ $TRAVIS_BRANCH = "master" && $BUILD_DOCS -eq 1 ]]; then
     if [[ -d "build/doc_doxygen/html" ]]; then
         git clone -b gh-pages "https://$GH_TOKEN@github.com/ymherklotz/YAGE.git" YAGE_gh-pages
@@ -24,10 +29,9 @@ if [[ $TRAVIS_BRANCH = "master" && $BUILD_DOCS -eq 1 ]]; then
         git config user.name "TravisBot"
         git config user.email ""
         rm -rf *
-        cp -r build/doc_doxygen/html/* .
+        cp -r ../build/doc_doxygen/html/* .
         git add -A .
         git commit -m "[Travis] Rebuilding documentation"
         git push -q origin gh-pages
-        cd ..
     fi
 fi
-- 
cgit