diff options
| author | Wouter van Oortmerssen <aardappel@gmail.com> | 2018-06-08 11:03:34 -0700 |
|---|---|---|
| committer | Wouter van Oortmerssen <aardappel@gmail.com> | 2018-06-08 11:03:34 -0700 |
| commit | 9bab626cbf3c3740bddfe90c839ccb1286d2842e (patch) | |
| tree | f7e8c88a81890c95a284d8d08c1914553c202dd3 /.travis.yml | |
| parent | effb60802733989c0783e4a57898957fcc728824 (diff) | |
| download | flatbuffers-9bab626cbf3c3740bddfe90c839ccb1286d2842e.tar.gz flatbuffers-9bab626cbf3c3740bddfe90c839ccb1286d2842e.tar.bz2 flatbuffers-9bab626cbf3c3740bddfe90c839ccb1286d2842e.zip | |
Removed biicode from repo.
Change-Id: I8b517fb8eaf02772052d95ca55bdaa0efbffa65a
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 6cc6b033..6336f2b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,8 @@ matrix: env: matrix: - - BUILD_TYPE=Debug BIICODE=false - - BUILD_TYPE=Release BIICODE=false CONAN=true - # biicode .deb files no longer available. - # - BUILD_TYPE=Release BIICODE=true - # - BUILD_TYPE=Debug BIICODE=true + - BUILD_TYPE=Debug + - BUILD_TYPE=Release CONAN=true before_install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi @@ -54,8 +51,7 @@ matrix: - 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" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then ./biicode/support/bii-travis.sh $BUILD_TYPE; fi + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test - if [ "$CONAN" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo pip install conan && conan create . flatbuffers/testing -s build_type=$BUILD_TYPE; fi - language: android |