aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-12-22 22:36:04 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-12-22 22:36:04 +0000
commit0f9d8a7f951a58252175c0b3280f24ef6529150f (patch)
tree450d879b5b30c0571ce7ed1928d337ce7146ab25 /scripts
parent204997112044a0920f3b379321c31274f5c73cb7 (diff)
downloadYAGE-0f9d8a7f951a58252175c0b3280f24ef6529150f.tar.gz
YAGE-0f9d8a7f951a58252175c0b3280f24ef6529150f.zip
[Travis] Improving build file and docs generation
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis_build6
1 files changed, 3 insertions, 3 deletions
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