another try
This commit is contained in:
parent
32cc6fefcc
commit
f63317dce3
1 changed files with 13 additions and 14 deletions
27
.travis.yml
27
.travis.yml
|
@ -23,10 +23,10 @@ matrix:
|
||||||
after_success:
|
after_success:
|
||||||
- make clean
|
- make clean
|
||||||
- touch src/json.hpp
|
- touch src/json.hpp
|
||||||
- make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage -std=c++11 -lstdc++" CXX=$COMPILER
|
- make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage -std=c++11 -lstdc++"
|
||||||
- ./json_unit "*"
|
- ./json_unit "*"
|
||||||
- coveralls --exclude test/src/catch.hpp --exclude test/src/unit.cpp --include src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
|
- coveralls --exclude test/src/catch.hpp --exclude test/src/unit.cpp --include src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
|
||||||
env: COMPILER=g++-4.9
|
env: CXX=g++-4.9
|
||||||
|
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
@ -42,16 +42,15 @@ matrix:
|
||||||
build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
|
build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
|
||||||
build_command: "make"
|
build_command: "make"
|
||||||
branch_pattern: coverity_scan
|
branch_pattern: coverity_scan
|
||||||
env: COMPILER=g++-5
|
env: CXX=g++-5
|
||||||
|
|
||||||
# from https://github.com/travis-ci/travis-ci/issues/6120
|
# from https://github.com/travis-ci/travis-ci/issues/6120
|
||||||
- os: linux
|
- os: linux
|
||||||
env:
|
env:
|
||||||
- LLVM_VERSION=3.8.0
|
- LLVM_VERSION=3.8.0
|
||||||
- LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
|
- LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
|
||||||
- COMPILER=$HOME/clang-$LLVM_VERSION/bin/clang++
|
- CXX=$HOME/clang-$LLVM_VERSION/bin/clang++
|
||||||
- CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
|
- CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
|
||||||
- CXXFLAGS=-lc++
|
|
||||||
before_install:
|
before_install:
|
||||||
- wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
|
- wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
|
||||||
- mkdir $HOME/clang-$LLVM_VERSION
|
- mkdir $HOME/clang-$LLVM_VERSION
|
||||||
|
@ -104,55 +103,55 @@ matrix:
|
||||||
osx_image: beta-xcode6.1
|
osx_image: beta-xcode6.1
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: beta-xcode6.2
|
osx_image: beta-xcode6.2
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: beta-xcode6.3
|
osx_image: beta-xcode6.3
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode6.4
|
osx_image: xcode6.4
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode7.1
|
osx_image: xcode7.1
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode7.2
|
osx_image: xcode7.2
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode7.3
|
osx_image: xcode7.3
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
- COMPILER=clang
|
- CXX=clang
|
||||||
- CXXFLAGS=-lstdc++
|
- CXXFLAGS=-lstdc++
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- uname -a
|
- uname -a
|
||||||
- $COMPILER --version
|
- $CXX --version
|
||||||
- make CXX=$COMPILER
|
- make
|
||||||
- ./json_unit "*"
|
- ./json_unit "*"
|
||||||
- if [ `which valgrind` ]; then
|
- if [ `which valgrind` ]; then
|
||||||
valgrind --error-exitcode=1 --leak-check=full ./json_unit ;
|
valgrind --error-exitcode=1 --leak-check=full ./json_unit ;
|
||||||
|
|
Loading…
Reference in a new issue