From 10bdcefa4aa14c55e318267173ebf5376c9e5784 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Fri, 8 Jun 2018 11:10:41 -0700 Subject: [PATCH] Re-enable clang / os x in .travis Change-Id: I45f6326f1b7da2d83eeee72fe44fd9626a288b5b --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6336f2b41..4675514ee 100644 --- a/.travis.yml +++ b/.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: