summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml30
1 files changed, 21 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 3f4e75ef..57bd36f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,25 +12,37 @@ sudo: false
addons:
apt:
+ # We need cmake > 2.8.7
+ # https://github.com/travis-ci/travis-ci/issues/4631#issuecomment-191153634
+ sources:
+ - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
packages:
+ - cmake
+ - cmake-data
+ - libboost-dev
- libdb-dev
- libreadline-dev
- libssl-dev
- libwww-perl
+ - time
- xsltproc
- zlib1g-dev
-before_script:
- - ccache -s
- - ./bootstrap
- - ./configure CC="ccache $CC" CXX="ccache $CXX"
- - grep CXX config.status
- - make
-
env:
- TEST_TARGET=debug
- TEST_TARGET=release
+ - 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:
- - ./runtest.pl ALL $TEST_TARGET
- - ccache -s
+ - env EXTRA_MAKE_ARGS=-j2 ./infrastructure/travis-build.sh