diff --git a/.travis.yml b/.travis.yml index df02bd79..bf222c90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,17 @@ matrix: include: - os: linux services: docker - before_install: + before_install: - docker pull glportal/whale-gcc:coverall script: - docker run -it --rm -w /data -v $(pwd):/data glportal/whale-gcc:coverall bash -c "cmake -DCOVERAGE:BOOL=ON ./&& make tests&& ctest&& coveralls --dryrun -i include -i source -e tests --gcov-options \'-lp\' && cmake -DCOVERAGE:BOOL=ON ./&& make tests&& ctest&& coveralls -i include -i source -e tests --gcov-options \'-lp\' > /dev/null;" - os: osx osx_image: xcode8.3 - compiler: gcc git: submodules: false before_install: - brew update + - rm '/usr/local/include/c++' install: - brew install gcc5 - brew install assimp @@ -33,30 +33,6 @@ matrix: script: - cmake -DCMAKE_CXX_COMPILER=g++-5 -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX=$PWD/install .. - make -j4 - - os: osx - osx_image: xcode8.3 - compiler: clang - git: - submodules: false - before_install: - - brew update - install: - - brew install assimp - - brew install libepoxy - - brew install sdl2 - - brew install sdl2_mixer - - brew install bullet - - brew install tinyxml2 - - brew install unittest-cpp - - brew install freeimage - before_script: - - git submodule update --init --recursive - - mkdir build && cd build - script: - - set -e - - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install .. - - make -j4 - notifications: irc: "chat.freenode.net#glportal" slack: glportal:6owD9V6VXhGmM7yyEd2hIZue