diff options
author | Chris Wilson <chris+github@qwirx.com> | 2017-05-15 21:16:13 +0100 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2017-06-18 11:11:08 +0100 |
commit | 14e48b9851920cb2beb000610b36391879dcb201 (patch) | |
tree | 0aa1191b68a9070c9db12824cff4573732fac7d5 /.travis.yml | |
parent | a3e328ef8f83d81f74b6a334ff6ad66d7dcbd534 (diff) |
Add Boost to Travis build environment, and OSX builds
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 96e8bf26..57bd36f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,12 @@ addons: packages: - cmake - cmake-data + - libboost-dev - libdb-dev - libreadline-dev - libssl-dev - libwww-perl + - time - xsltproc - zlib1g-dev @@ -32,5 +34,15 @@ env: - BUILD=cmake TEST_TARGET=debug - BUILD=cmake TEST_TARGET=release +os: + - linux + - osx + +matrix: + exclude: + # No point testing both GCC and Clang on Mac OS X, as they're the same thing. + - os: osx + compiler: gcc + script: - - ./infrastructure/travis-build.sh + - env EXTRA_MAKE_ARGS=-j2 ./infrastructure/travis-build.sh |