Merge pull request #208 from khaledhosny/travis-trusty

[travis] Try building on Trusty
This commit is contained in:
Behdad Esfahbod 2016-01-02 00:59:14 +00:00
commit 3a48c77670
1 changed files with 3 additions and 2 deletions

View File

@ -1,8 +1,9 @@
# Build Configuration for Travis # Build Configuration for Travis
sudo: false # Use Travis docker infrastructure sudo: required # For Trusty beta
os: os:
- linux - linux
- osx - osx
dist: trusty
language: cpp language: cpp
compiler: compiler:
- clang - clang
@ -11,7 +12,7 @@ env:
global: global:
- CPPFLAGS="" - CPPFLAGS=""
- CFLAGS="-Werror --coverage" - CFLAGS="-Werror --coverage"
- CXXFLAGS="-Werror --coverage" - CXXFLAGS="-Werror -Wno-deprecated-register --coverage" # glib uses register and clang raises a warning
- LDFLAGS="--coverage" - LDFLAGS="--coverage"
install: install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user nose; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user nose; fi