Skip to content

Commit 7230330

Browse files
committed
travis: build on osx too
1 parent 58532ed commit 7230330

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

.travis.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
language: c
55

6+
os:
7+
- linux
8+
- osx
9+
610
compiler:
711
- gcc
812
- clang
@@ -17,26 +21,30 @@ env:
1721

1822
matrix:
1923
fast_finish: true
24+
exclude:
25+
- os: osx
26+
compiler: gcc
2027
include:
2128
- compiler: i586-mingw32msvc-gcc
2229
env: OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON -DUSE_SSH=OFF"
30+
os: linux
2331
- compiler: gcc
2432
env: COVERITY=1
33+
os: linux
2534
allow_failures:
2635
- env: COVERITY=1
2736

2837
install:
29-
- sudo apt-get -qq update
30-
- sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server
38+
- ./script/install-deps-${TRAVIS_OS_NAME}.sh
3139

3240
# Run the Build script and tests
3341
script:
3442
- script/cibuild.sh
3543

3644
# Run Tests
3745
after_success:
38-
- sudo apt-get -qq install valgrind
39-
- valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline
46+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install valgrind; fi
47+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi
4048

4149
# Only watch the development branch
4250
branches:

script/install-deps-linux.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
set -x
4+
5+
sudo apt-get -qq update &&
6+
sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server

script/install-deps-osx.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
set -x
4+
5+
brew install libssh2 cmake

0 commit comments

Comments
 (0)