From be503cb0f297e64cbe197bab2af5ab88724418b6 Mon Sep 17 00:00:00 2001 From: Muhammed Thanish Date: Thu, 10 Sep 2015 09:51:35 +0530 Subject: [PATCH] Fix OSX related errors on travis - Install g++ and cmake only on Linux. - Use biicode only on Linux machines. --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0358a20..7c3fd34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,13 @@ env: - GCC_VERSION="4.9" before_install: -- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test -- sudo apt-get update -qq -- sudo apt-get install -qq g++-$GCC_VERSION -- sudo apt-get install -qq gcc-$GCC_VERSION -- sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++ -- sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc +- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq gcc-$GCC_VERSION; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi script: - if [ "$BIICODE" == "false" ]; then cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test; fi -- if [ "$BIICODE" == "true" ]; then ./biicode/support/bii-travis.sh $BUILD_TYPE; fi +- if [ "$BIICODE" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then ./biicode/support/bii-travis.sh $BUILD_TYPE; fi -- 2.7.4