xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to simplify back travis config

Browse Source
This commit is contained in:
Maxime Coste 2016-10-06 13:42:53 +01:00 committed by Maxime Coste
parent ba83cbee0e
commit c19b9d0b8b
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@ -18,21 +18,12 @@ before_install:
install: install:
- if [ $TRAVIS_OS_NAME = linux ]; then - if [ $TRAVIS_OS_NAME = linux ]; then
if [ "$CXX" = "clang++" ]; then if [ "$CXX" = "clang++" ]; then
export CXX=clang++-3.7; export CXX=clang++-3.5;
elif [ "$CXX" = "g++" ]; then elif [ "$CXX" = "g++" ]; then
export CXX=g++-5; export CXX=g++-5;
fi; fi;
elif [ $TRAVIS_OS_NAME = osx ]; then elif [ $TRAVIS_OS_NAME = osx ]; then
if [ "$CXX" = "clang++" ]; then brew outdated gcc || brew upgrade gcc;
brew install llvm36 && brew link --force llvm36;
export CXX="clang++-3.6 -stdlib=libc++";
export CXXFLAGS="$CXXFLAGS -nostdinc++ -I/usr/local/opt/llvm36/lib/llvm-3.6/include/c++/v1";
export LDFLAGS="$LDFLAGS -L/usr/local/opt/llvm36/lib/llvm-3.6/lib";
elif [ "$CXX" = "g++" ]; then
brew outdated gcc || brew upgrade gcc;
brew unlink boost; brew install boost --cc=gcc-5;
export CXX=g++-5;
fi;
fi; fi;
env: env:
global: global:
@ -43,9 +34,9 @@ addons:
sources: sources:
- boost-latest - boost-latest
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.5
packages: packages:
- clang-3.7 - clang-3.5
- libstdc++-5-dev - libstdc++-5-dev
- g++-5 - g++-5
- libncursesw5-dev - libncursesw5-dev
@ -59,9 +50,4 @@ addons:
build_command: "make -j4" build_command: "make -j4"
branch_pattern: coverity-scan branch_pattern: coverity-scan
matrix:
exclude:
- compiler: gcc
os: osx
script: cd src && make && make test script: cd src && make && make test