Re-enable clang / os x in .travis
authorWouter van Oortmerssen <aardappel@gmail.com>
Fri, 8 Jun 2018 18:10:41 +0000 (11:10 -0700)
committerWouter van Oortmerssen <aardappel@gmail.com>
Fri, 8 Jun 2018 18:20:57 +0000 (11:20 -0700)
Change-Id: I45f6326f1b7da2d83eeee72fe44fd9626a288b5b

.travis.yml

index 6336f2b..4675514 100644 (file)
@@ -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: