From 0f9d8a7f951a58252175c0b3280f24ef6529150f Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Fri, 22 Dec 2017 22:36:04 +0000
Subject: [Travis] Improving build file and docs generation

---
 .travis.yml          | 2 +-
 scripts/travis_build | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b3f92f3..0cc4da23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ matrix:
             - ubuntu-toolchain-r-test
       compiler: g++-7
       env:
-        - "MATRIX_EVAL=\"CC=gcc-7 && CXX=g++-7\""
+        - "MATRIX_EVAL=\"CC=gcc-7 && CXX=g++-7 && BUILD_DOCS=1\""
       os: linux
     -
       addons:
diff --git a/scripts/travis_build b/scripts/travis_build
index 3cca70a2..40c774eb 100755
--- a/scripts/travis_build
+++ b/scripts/travis_build
@@ -17,8 +17,8 @@ ctest
 cd ../..
 
 # update docs if we are on the master branch
-if [[ "$TRAVIS_BRANCH" == "master" ]]; then
-    if [ -d "$TRAVIS_BUILD_DIR/build/doc_doxygen/html" ]; then
+if [[ $TRAVIS_BRANCH = "master" && $BUILD_DOCS -eq 1 ]]; then
+    if [[ -d "$TRAVIS_BUILD_DIR/build/doc_doxygen/html" ]]; then
         git clone -b gh-pages "https://$GH_TOKEN@github.com/ymherklotz/YAGE.git" YAGE_gh-pages
         cd YAGE_gh-pages
         git config user.name "TravisBot"
@@ -26,7 +26,7 @@ if [[ "$TRAVIS_BRANCH" == "master" ]]; then
         rm -rf *
         cp -r ../build/doc_doxygen/html/* .
         git add -A .
-        git commit -m "Rebuilding documentation"
+        git commit -m "[Travis] Rebuilding documentation"
         git push -q origin gh-pages
         cd ..
     fi
-- 
cgit