aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml80
1 files changed, 56 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml
index 57a1d13..d04c26a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,63 @@
language: c++
-sudo: required
-dist: trusty
-
-addons: &addons
- apt:
- sources: &sources
- - ubuntu-toolchain-r-test
- packages: &packages
- - libzmq3-dev
- - libzmq3
- - automake
- - libtool
- - libboost1.55-all-dev
- - libcurl4-openssl-dev
- - g++-6
-
-env:
- - CONF=--disable-output-edi
- - CONF=
- - CONF=--enable-output-raw
-
-compiler:
- - gcc
+
+matrix:
+ include:
+ # Clang on OSX
+ - env: CC=clang CXX=clang++ CONF=
+ os: osx
+ osx_image: xcode9.1
+ compiler: clang
+
+ # GCC and clang builds on Linux
+ - env: CC=gcc-6 CXX=g++-6 CONF=--disable-output-edi
+ os: linux
+ dist: trusty
+ sudo: required
+ compiler: gcc
+ addons: &linuxaddons
+ apt:
+ sources: &sources
+ - ubuntu-toolchain-r-test
+ packages: &packages
+ - libzmq3-dev
+ - libzmq3
+ - automake
+ - libtool
+ - libboost1.55-all-dev
+ - libcurl4-openssl-dev
+ - g++-6
+
+ - env: CC=gcc-6 CXX=g++-6 CONF=--enable-output-raw
+ compiler: gcc
+ addons: *linuxaddons
+
+ - env: CC=gcc-6 CXX=g++-6 CONF=
+ compiler: gcc
+ addons: *linuxaddons
+
+ - env: CC=clang-4.0 CXX=clang++-4.0 CONF=--enable-output-raw
+ compiler: clang
+ addons: &linuxclang40
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-trusty-4.0
+ packages:
+ - libzmq3-dev
+ - libzmq3
+ - automake
+ - libtool
+ - libboost1.55-all-dev
+ - libcurl4-openssl-dev
+ - clang-4.0
+
+before_install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boost zeromq automake curl ; fi
script:
- |
./bootstrap.sh
- CC=gcc-6 CXX=g++-6 ./configure $CONF
+ ./configure $CONF
make