diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2016-10-06 13:42:53 +0100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2017-07-19 08:49:43 +0200 |
| commit | c19b9d0b8b009a8a864fab890bfab2c745d6662a (patch) | |
| tree | bf08f49076b9a108fb50f9f7959c1804f7a6821c | |
| parent | ba83cbee0e87400f5882cdf35ac4a59dc02b3741 (diff) | |
Try to simplify back travis config
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index f4f85e03..d2c4dd59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,21 +18,12 @@ before_install: install: - if [ $TRAVIS_OS_NAME = linux ]; then if [ "$CXX" = "clang++" ]; then - export CXX=clang++-3.7; + export CXX=clang++-3.5; elif [ "$CXX" = "g++" ]; then export CXX=g++-5; fi; elif [ $TRAVIS_OS_NAME = osx ]; then - if [ "$CXX" = "clang++" ]; then - 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; + brew outdated gcc || brew upgrade gcc; fi; env: global: @@ -43,9 +34,9 @@ addons: sources: - boost-latest - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 + - llvm-toolchain-precise-3.5 packages: - - clang-3.7 + - clang-3.5 - libstdc++-5-dev - g++-5 - libncursesw5-dev @@ -59,9 +50,4 @@ addons: build_command: "make -j4" branch_pattern: coverity-scan -matrix: - exclude: - - compiler: gcc - os: osx - script: cd src && make && make test |