diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 760847978..9022fdec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,17 @@ env: - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release" - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON" +addons: + apt: + packages: + - cmake + - libssh2-1-dev + - openssh-client + - openssh-server + - valgrind + +sudo: false + matrix: fast_finish: true exclude: @@ -44,7 +55,7 @@ matrix: OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" install: - - ./script/install-deps-${TRAVIS_OS_NAME}.sh + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi # Run the Build script and tests script: @@ -52,7 +63,6 @@ script: # Run Tests after_success: - - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then sudo apt-get -qq install valgrind; fi - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi # Only watch the development and master branches |