Update .travis.yml

Restore xcode, block CLANG_VER.
This commit is contained in:
Alek Mosingiewicz 2018-08-20 11:25:59 +02:00 committed by GitHub
parent fdd3bf1ccf
commit 96142889e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,11 +41,11 @@ matrix:
compiler: gcc compiler: gcc
- os: osx - os: osx
compiler: clang compiler: clang
#osx_image: xcode10 osx_image: xcode10
env: CLANG_VER="5.0" env: CLANG_VER="5.0"
- os: osx - os: osx
compiler: clang compiler: clang
#osx_image: xcode10 #sx_image: xcode10
env: CLANG_VER="5.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1 env: CLANG_VER="5.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1
env: env:
@ -56,7 +56,7 @@ env:
before_install: before_install:
- if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi - if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi
- if [ "${CLANG_VER}" != "" ]; then export CXX="clang++-$CLANG_VER"; fi #- if [ "${CLANG_VER}" != "" ]; then export CXX="clang++-$CLANG_VER"; fi
- pip install --user cpp-coveralls - pip install --user cpp-coveralls
script: script: