From 4bd12ceacdf71b13537eccf1f537a1606537586a Mon Sep 17 00:00:00 2001 From: Giovanni Bussi <giovanni.bussi@gmail.com> Date: Fri, 5 Jun 2015 11:57:36 +0200 Subject: [PATCH] clean up travis stuff there are too many travis files. I moved all of them on a .travis directory (except for .travis.yml that should be in root directory) --- .travis.yml | 16 ++++++++-------- .travis.check.log => .travis/check.log | 0 .travis.install.almost => .travis/install.almost | 0 .../install.cppcheck | 0 .../install.doxygen | 0 .../install.xdrfile | 0 .travis.pushdoc => .travis/pushdoc | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename .travis.check.log => .travis/check.log (100%) rename .travis.install.almost => .travis/install.almost (100%) rename .travis.install.cppcheck => .travis/install.cppcheck (100%) rename .travis.install.doxygen => .travis/install.doxygen (100%) rename .travis.install.xdrfile => .travis/install.xdrfile (100%) rename .travis.pushdoc => .travis/pushdoc (100%) diff --git a/.travis.yml b/.travis.yml index ffb2690f0..fa2a9e022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,30 +26,30 @@ matrix: install: # build the manual, only if log contains string [makedoc] - export PLUMED_NUM_THREADS=2 - - ./.travis.check.log makedoc || MAKEDOC=no - - ./.travis.check.log valgrind || VALGRIND=no - - ./.travis.check.log almost || ALMOST=no + - ./.travis/check.log makedoc || MAKEDOC=no + - ./.travis/check.log valgrind || VALGRIND=no + - ./.travis/check.log almost || ALMOST=no # install some package - these are fast, we install them anyway - sudo apt-get update -qq - sudo apt-get install -y libmatheval-dev - - ./.travis.install.xdrfile + - ./.travis/install.xdrfile - LIBRARY_PATH="$LIBRARY_PATH:/usr/local/lib" - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" # cppcheck: - - test "$CPPCHECK" == yes && ./.travis.install.cppcheck 1.69 || true + - test "$CPPCHECK" == yes && ./.travis/install.cppcheck 1.69 || true # installation of these packages takes a lot of time # we do it only when needed - test "$PLUMED_CXX" == "mpic++" && sudo apt-get install -y libopenmpi1.5-dev openmpi1.5-bin || true - test "$MAKEDOC" == yes && sudo apt-get install -y graphviz || true # doxygen from its repository (apt-get gets an old version) -# - test "$MAKEDOC" == yes && ./.travis.install.doxygen || true +# - test "$MAKEDOC" == yes && ./.travis/install.doxygen || true # it seems that here we can get precompiled doxygen and latex - test "$MAKEDOC" == yes && sudo apt-add-repository -y ppa:libreoffice/ppa || true - test "$MAKEDOC" == yes && sudo apt-get update -qq || true - test "$MAKEDOC" == yes && sudo apt-get install -y doxygen doxygen-latex || true - test "$VALGRIND" == yes && sudo apt-get install -y valgrind || true - test "$LAPACK" == yes && sudo apt-get install libatlas-base-dev || true - - test "$ALMOST" == yes && ./.travis.install.almost || true + - test "$ALMOST" == yes && ./.travis/install.almost || true - test "$ALMOST" == yes && ENALMOST="--enable-almost" || true - test "$ALMOST" == yes && PLUMED_CPPFLAGS="$INCLUDE -I/usr/local/include -I/usr/local/include/almost" || true # moreover, we hardcode path to dynamic library, required for xdrfile to link properly @@ -71,4 +71,4 @@ script: - make -C regtest checkfail - if test "$CPPCHECK" == yes ; then make cppcheck ; fi after_success: - - test "$MAKEDOC" == yes && ./.travis.pushdoc + - test "$MAKEDOC" == yes && ./.travis/pushdoc diff --git a/.travis.check.log b/.travis/check.log similarity index 100% rename from .travis.check.log rename to .travis/check.log diff --git a/.travis.install.almost b/.travis/install.almost similarity index 100% rename from .travis.install.almost rename to .travis/install.almost diff --git a/.travis.install.cppcheck b/.travis/install.cppcheck similarity index 100% rename from .travis.install.cppcheck rename to .travis/install.cppcheck diff --git a/.travis.install.doxygen b/.travis/install.doxygen similarity index 100% rename from .travis.install.doxygen rename to .travis/install.doxygen diff --git a/.travis.install.xdrfile b/.travis/install.xdrfile similarity index 100% rename from .travis.install.xdrfile rename to .travis/install.xdrfile diff --git a/.travis.pushdoc b/.travis/pushdoc similarity index 100% rename from .travis.pushdoc rename to .travis/pushdoc -- GitLab