forked from BigfootDev/flatbuffers
Re-enable clang / os x in .travis
Change-Id: I45f6326f1b7da2d83eeee72fe44fd9626a288b5b
This commit is contained in:
12
.travis.yml
12
.travis.yml
@@ -31,11 +31,9 @@ matrix:
|
||||
- language: cpp
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
|
||||
compiler:
|
||||
- gcc
|
||||
#- clang
|
||||
|
||||
env:
|
||||
matrix:
|
||||
@@ -54,6 +52,16 @@ matrix:
|
||||
- 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: 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
|
||||
sudo: true
|
||||
android:
|
||||
|
||||
Reference in New Issue
Block a user