Update Travis to use xcode 10.2

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-06-20 18:00:02 +02:00 committed by eboasson
parent f6fc1751e9
commit 95ea8fbf32

View file

@ -67,9 +67,9 @@ linux_clang: &linux_clang
install: install:
- pip install conan --upgrade --user - pip install conan --upgrade --user
osx_xcode10_1: &osx_xcode10_1 osx_xcode10_2: &osx_xcode10_2
os: osx os: osx
osx_image: xcode10.1 osx_image: xcode10.2
compiler: clang compiler: clang
addons: addons:
homebrew: homebrew:
@ -141,9 +141,9 @@ jobs:
env: [ ARCH=x86_64, ASAN=address, BUILD_TYPE=Debug, GENERATOR="Unix Makefiles" ] env: [ ARCH=x86_64, ASAN=address, BUILD_TYPE=Debug, GENERATOR="Unix Makefiles" ]
- <<: *linux_clang - <<: *linux_clang
env: [ ARCH=x86_64, ASAN=none, BUILD_TYPE=Release, GENERATOR="Unix Makefiles" ] env: [ ARCH=x86_64, ASAN=none, BUILD_TYPE=Release, GENERATOR="Unix Makefiles" ]
- <<: *osx_xcode10_1 - <<: *osx_xcode10_2
env: [ ARCH=x86_64, ASAN=address, BUILD_TYPE=Debug, GENERATOR="Unix Makefiles" ] env: [ ARCH=x86_64, ASAN=address, BUILD_TYPE=Debug, GENERATOR="Unix Makefiles" ]
- <<: *osx_xcode10_1 - <<: *osx_xcode10_2
env: [ ARCH=x86_64, ASAN=none, BUILD_TYPE=Release, GENERATOR="Unix Makefiles" ] env: [ ARCH=x86_64, ASAN=none, BUILD_TYPE=Release, GENERATOR="Unix Makefiles" ]
- <<: *windows_vs2017 - <<: *windows_vs2017
env: [ ARCH=x86, ASAN=none, BUILD_TYPE=Debug, GENERATOR="Visual Studio 15 2017" ] env: [ ARCH=x86, ASAN=none, BUILD_TYPE=Debug, GENERATOR="Visual Studio 15 2017" ]