diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-05-21 12:45:22 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-05-21 14:43:44 +0200 |
| commit | 7230330740eff79dc910d2a20418545bdcf2f65c (patch) | |
| tree | 69e0ce05f5e2200f62731824f872ed3238acd324 | |
| parent | 58532ed07619e3576f4e7982ffc28cead44cb661 (diff) | |
| download | libgit2-cmn/dual-os.tar.gz | |
travis: build on osx toocmn/dual-os
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rwxr-xr-x | script/install-deps-linux.sh | 6 | ||||
| -rwxr-xr-x | script/install-deps-osx.sh | 5 |
3 files changed, 23 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index fcae726dd..bab02bb44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ language: c +os: + - linux + - osx + compiler: - gcc - clang @@ -17,17 +21,21 @@ env: matrix: fast_finish: true + exclude: + - os: osx + compiler: gcc include: - compiler: i586-mingw32msvc-gcc env: OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON -DUSE_SSH=OFF" + os: linux - compiler: gcc env: COVERITY=1 + os: linux allow_failures: - env: COVERITY=1 install: - - sudo apt-get -qq update - - sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server + - ./script/install-deps-${TRAVIS_OS_NAME}.sh # Run the Build script and tests script: @@ -35,8 +43,8 @@ script: # Run Tests after_success: - - sudo apt-get -qq install valgrind - - valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install valgrind; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi # Only watch the development branch branches: diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh new file mode 100755 index 000000000..347922b89 --- /dev/null +++ b/script/install-deps-linux.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +set -x + +sudo apt-get -qq update && +sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server diff --git a/script/install-deps-osx.sh b/script/install-deps-osx.sh new file mode 100755 index 000000000..c2e0162d8 --- /dev/null +++ b/script/install-deps-osx.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -x + +brew install libssh2 cmake |