aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaeseung Ha <ipknhama@gmail.com>2015-09-21 07:30:06 +0900
committerJaeseung Ha <ipknhama@gmail.com>2015-09-21 07:30:06 +0900
commit64aa41af82d53807273f84685cf7ed4fb8449dc0 (patch)
treec865bd76a34487b31ab746ab938144f45e6d3997
parente4708671bcfd2514edaa1a8e0bd5fa58f00c5fd1 (diff)
parent3b339c10e228a965e567ae5c57da840b1b0578ac (diff)
downloadcrow-64aa41af82d53807273f84685cf7ed4fb8449dc0.tar.gz
crow-64aa41af82d53807273f84685cf7ed4fb8449dc0.zip
Merge pull request #86 from whoshuu/travis-upgrade
Use the new travis container architecture
-rw-r--r--.travis.yml32
1 files changed, 21 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index a547957..cec0186 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,34 @@
language: cpp
+sudo: false
+
notifications:
irc: "chat.freenode.net##crow"
compiler:
- gcc
- #- clang
+
+env:
+ matrix:
+ - COMPILER=g++-4.8 CCOMPILER=gcc-4.8 PUSH_COVERAGE=ON
+
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - boost-latest
+ packages:
+ - g++-4.8
+ - libboost1.55-all-dev
+ - python-pip
+
+install:
+ - if [ "$PUSH_COVERAGE" == "ON" ]; then pip install --user git+git://github.com/eddyxu/cpp-coveralls.git; fi
before_script:
- - sudo pip install cpp-coveralls
- - sudo add-apt-repository -y ppa:kalakris/cmake
- - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- - sudo add-apt-repository -y ppa:boost-latest/ppa
- - sudo apt-get -qq update
- - sudo apt-get install -qq libboost1.55-all-dev
- - sudo apt-get install -qq g++-4.8
- - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+ - export CXX=$COMPILER CC=$CCOMPILER
- mkdir build
- cd build
- - sudo apt-get install cmake
- cmake --version
- cmake ..
@@ -26,4 +36,4 @@ script: make && ctest
after_success:
- cd ..
- - coveralls --gcov gcov-4.8 -i include --gcov-options '\-lp'
+ - if [ "PUSH_COVERAGE" == "ON" ]; then coveralls --gcov gcov-4.8 -i include --gcov-options '\-lp'; fi