aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-05-19 09:33:21 +0100
committerYann Herklotz <ymherklotz@gmail.com>2018-05-19 14:55:01 +0100
commit6985227db75f6adfeba880926e6629bf17b00ee8 (patch)
tree71b35f8a59fb4b8fa43ddeaec86509278a80f0aa /scripts
parent5bc94281e5d240fb690b4863c30201bf14e0e735 (diff)
downloadYAGE-6985227db75f6adfeba880926e6629bf17b00ee8.tar.gz
YAGE-6985227db75f6adfeba880926e6629bf17b00ee8.zip
Adding back two compilers
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis_build26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/travis_build b/scripts/travis_build
index 0ce51e13..e60088c8 100755
--- a/scripts/travis_build
+++ b/scripts/travis_build
@@ -12,11 +12,11 @@ cd $TRAVIS_BUILD_DIR
# start building
mkdir -p build
cd build
-cmake ..
+cmake -DYAGE_BUILD_TESTS=ON -DYAGE_BUILD_DOCS=ON ..
make
cd tests
ctest -j 2 --schedule-random --repeat-until-fail 3
-cd ../..
+cd ..
# update docs if we are on the master branch
echo "TRAVIS_BRANCH = " $TRAVIS_BRANCH
@@ -25,15 +25,15 @@ 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
- cd YAGE_gh-pages
- git config user.name "TravisBot"
- git config user.email ""
- rm -rf *
- cp -r ../build/doc_doxygen/html/* .
- git add -A .
- git commit -m "[Travis] Rebuilding documentation"
- git push -q origin gh-pages
- fi
+ if [[ -d "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"
+ git config user.email ""
+ rm -rf *
+ cp -r ../build/doc_doxygen/html/* .
+ git add -A .
+ git commit -m "[Travis] Rebuilding documentation"
+ git push -q origin gh-pages
+ fi
fi