BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 19:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable clang / os x in .travis

Browse Source 
Change-Id: I45f6326f1b7da2d83eeee72fe44fd9626a288b5b
This commit is contained in:
Wouter van Oortmerssen
2018-06-08 11:10:41 -07:00
parent 9bab626cbf
commit 10bdcefa4a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -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:
- 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: