From 4a0bd2d2d866789edc3783b7f97915f73ad94719 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 16:19:01 +0100 Subject: [PATCH] travis test, 9 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbcce5db..0c1f41e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,10 @@ matrix: compiler: clang env: LLVM_VERSION="native" # broken compiler - os: osx - compiler: gcc # broken compiler + compiler: gcc # unsupported compiler - os: osx compiler: clang - env: LLVM_VERSION="3.7" # missing configuration here + env: LLVM_VERSION="3.7" # missing compiler by brew allow_failures: - os: osx # remove when native clang will work @@ -61,7 +61,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit fribidi miniupnpc wxmac; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit glib fribidi miniupnpc wxmac; fi - $CXX --version - cmake --version - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi