Skip to content

F
flatbuffers
Commit 10bdcefa authored by Wouter van Oortmerssen's avatar Wouter van Oortmerssen
Browse files
Options

Re-enable clang / os x in .travis 

Change-Id: I45f6326f1b7da2d83eeee72fe44fd9626a288b5b
parent 9bab626c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
.travis.yml
View file @ 10bdcefa
...@@ -31,11 +31,9 @@ matrix: ...@@ -31,11 +31,9 @@ matrix:
- language: cpp - language: cpp
os: os:
- linux - linux
- osx
compiler: compiler:
- gcc - gcc
#- clang
env: env:
matrix: matrix:
...@@ -54,6 +52,16 @@ matrix: ...@@ -54,6 +52,16 @@ matrix:
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test - 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 - if [ "$CONAN" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo pip install conan && conan create . flatbuffers/testing -s build_type=$BUILD_TYPE; fi
- language: cpp
os: osx
osx_image: xcode9.3
env:
matrix:
- BUILD_TYPE=Debug
- BUILD_TYPE=Release
script:
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test
- language: android - language: android
sudo: true sudo: true
android: android:
......
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