Skip to content

F
flatbuffers
Commit be503cb0 authored by Muhammed Thanish's avatar Muhammed Thanish
Browse files
Options

Fix OSX related errors on travis 

 - Install g++ and cmake only on Linux.
 - Use biicode only on Linux machines.
parent 782e05de
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
.travis.yml
View file @ be503cb0
...@@ -18,13 +18,13 @@ env: ...@@ -18,13 +18,13 @@ env:
- GCC_VERSION="4.9" - GCC_VERSION="4.9"
before_install: before_install:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
- sudo apt-get update -qq - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
- sudo apt-get install -qq g++-$GCC_VERSION - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi
- sudo apt-get install -qq gcc-$GCC_VERSION - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq gcc-$GCC_VERSION; fi
- sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++ - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++; fi
- sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi
script: script:
- if [ "$BIICODE" == "false" ]; then cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test; fi - 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment