aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-06-02 14:45:57 +0100
committerYann Herklotz <ymherklotz@gmail.com>2018-06-02 14:45:57 +0100
commit68ae9a98517ea2cb4bbe140f93baacf3f16549ab (patch)
tree71dac3a9ea34cc3d57e139301e7d029964e15b1c
parent320553f8c174c4f642d4b6a571de068eca5447f9 (diff)
downloadYAGE-68ae9a98517ea2cb4bbe140f93baacf3f16549ab.tar.gz
YAGE-68ae9a98517ea2cb4bbe140f93baacf3f16549ab.zip
Reverting build script0.1.5
-rwxr-xr-xscripts/travis_build36
1 files changed, 15 insertions, 21 deletions
diff --git a/scripts/travis_build b/scripts/travis_build
index c249bb36..1efb9364 100755
--- a/scripts/travis_build
+++ b/scripts/travis_build
@@ -6,10 +6,8 @@ set -eu
$CC --version
$CXX --version
-if [[ -z $TRAVIS_BUILD_DIR ]]; then
- # go to correct directory
- cd $TRAVIS_BUILD_DIR
-fi
+# go to correct directory
+cd $TRAVIS_BUILD_DIR
# start building
mkdir -p build
@@ -21,25 +19,21 @@ ctest -j 2 --schedule-random --repeat-until-fail 3
cd ../..
# update docs if we are on the master branch
-if [[ -z $TRAVIS_BUILD_DIR ]]; then
- echo "TRAVIS_BRANCH = " $TRAVIS_BRANCH
- echo "BUILD_DOCS = " $BUILD_DOCS
-fi
+echo "TRAVIS_BRANCH = " $TRAVIS_BRANCH
+echo "BUILD_DOCS = " $BUILD_DOCS
echo "CC = " $CC
echo "CXX = " $CXX
-if [[ -z $TRAVIS_BUILD_DIR ]]; then
- 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 [[ $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
fi