Skip to content

Commit

Permalink
Better travis + enable mac os x
Browse files Browse the repository at this point in the history
  • Loading branch information
daedric committed Feb 4, 2016
1 parent 0d30369 commit d61db6a
Showing 1 changed file with 26 additions and 6 deletions.
32 changes: 26 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
language:
- cpp

os:
- linux
- osx

compiler:
- clang
- gcc

sudo: required
dist: trusty
matrix:
allow_failures:
- os: osx
include:
- os: linux
dist: trusty
sudo: required
- os: osx

env:
global:
Expand All @@ -22,12 +32,22 @@ env:
- BUILD_EXAMPLES="ON" BUILD_TESTS="ON" CMAKE_BUILD_TYPE="Debug" HTTPP_PARSER_BACKEND=Stream USE_BOOST_PROMISE=OFF


addons:
apt:
packages:
- clang-3.6
- g++-4.8
- libboost-all-dev
- libssl-dev
- libtbb-dev
- cmake
- libcurl4-openssl-dev
- libhwloc-dev

before_install:
- git submodule update --init --recursive

install:
- sudo apt-get update
- sudo apt-get install -y clang-3.6 g++-4.8 libboost-all-dev libssl-dev libtbb-dev cmake
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap homebrew/science && brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install tbb hwloc; fi

before_script:
# update compilers
Expand Down

0 comments on commit d61db6a

Please sign in to comment.