diff --git a/.travis.yml b/.travis.yml index 9cbe4d0362cb0a1202daa16879501bb71e6f554b..580c06115a487174635b28330d927945eb8a44f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: install: - pip install --user sphinx sphinx_rtd_theme - - sudo apt-get install mpich2 gfortran + # - sudo apt-get install mpich2 gfortran script: bash ./build_and_deploy.sh diff --git a/build_and_deploy.sh b/build_and_deploy.sh index faba27e26452332f66ba81c0d8211f7f70631351..1819bb952f7e92b084929298a3efadbb1b149835 100755 --- a/build_and_deploy.sh +++ b/build_and_deploy.sh @@ -7,14 +7,14 @@ set -e # Exit with nonzero exit code if anything fails #make -j4 # Then we build and deploy the sphinx / doxygen documentation -#SOURCE_BRANCH="master" +SOURCE_BRANCH="master" #TARGET_BRANCH="gh-pages" # Pull requests and commits to other branches shouldn't try to deploy -#if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then -# echo "Skipping deploy." -# exit 0 -#fi +if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then + echo "Skipping deploy." + exit 0 +fi # Save some useful information #REPO=`git config remote.origin.url`