Skip to content
Snippets Groups Projects
Commit 8486b913 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.2' into v2.3

parents cef4ee70 31178d29
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
.travis.yml
+ 2
− 1
View file @ 8486b913
...@@ -71,7 +71,8 @@ install: ...@@ -71,7 +71,8 @@ install:
- export LD_LIBRARY_PATH="$HOME/opt/lib:$LD_LIBRARY_PATH" - export LD_LIBRARY_PATH="$HOME/opt/lib:$LD_LIBRARY_PATH"
# build the manual, only if log contains string [makedoc] # build the manual, only if log contains string [makedoc]
- export PLUMED_NUM_THREADS=2 - export PLUMED_NUM_THREADS=2
- ./.travis/check.log makedoc || MAKEDOC=no # accept both [makedoc] and [makedocs] as an option
- ./.travis/check.log makedoc || ./.travis/check.log makedocs || MAKEDOC=no
- ./.travis/check.log valgrind || VALGRIND=no - ./.travis/check.log valgrind || VALGRIND=no
# update packages # update packages
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && test -z "$PLUMED_MACPORTS" ; then brew update > /dev/null ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && test -z "$PLUMED_MACPORTS" ; then brew update > /dev/null ; fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment