From 378b4b19d7a6e6e3d863f3cb16be8b4d000c2734 Mon Sep 17 00:00:00 2001 From: Jeroen Koekkoek Date: Wed, 2 Oct 2019 12:59:14 +0200 Subject: [PATCH] Add macOS 10.12 / Xcode 9 build on Travis CI Signed-off-by: Jeroen Koekkoek --- .travis.yml | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d59e91..30d38c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,18 +74,36 @@ osx_xcode10_3: &osx_xcode10_3 compiler: clang addons: homebrew: - packages: - - pyenv-virtualenv + packages: [ python3 ] before_install: - eval "export CC=clang" - eval "export CXX=clang++" - eval "export COV_COMPTYPE=clang COV_PLATFORM=macOSX" + - eval "export PATH=\"${PATH}:$(python3 -m site --user-base)/bin\"" install: - - eval "$(pyenv init -)" - - pyenv virtualenv conan - - pyenv rehash - - pyenv activate conan - - pip install conan --upgrade + - pip3 install conan --upgrade --user + +osx_xcode9: &osx_xcode9 + <<: *osx_xcode10_3 + osx_image: xcode9 + cache: + directories: + - $HOME/Library/Caches/Homebrew + - /usr/local/Homebrew + addons: + homebrew: + packages: [ python3 ] + # Homebrew must be updated before packages can be installed on outdated + # macOS images. The update process unfortunately takes a VERY long time + # and can even cause Travis to terminate the build. Travis caching is + # used to ensure Homebrew is kept up-to-date and build times are kept to + # a minimum. + update: true + before_cache: + - brew cleanup + - find /usr/local/Homebrew -type d -name .git | + xargs -I {} dirname {} | + xargs -I {} git --git-dir={}/.git --work-tree={} clean -f -d -x windows_vs2017: &windows_vs2017 os: windows @@ -147,6 +165,8 @@ jobs: env: [ ARCH=x86_64, ASAN=address, BUILD_TYPE=Debug, SSL=YES, GENERATOR="Unix Makefiles" ] - <<: *linux_clang env: [ ARCH=x86_64, ASAN=none, BUILD_TYPE=Release, SSL=YES, GENERATOR="Unix Makefiles" ] + - <<: *osx_xcode9 + env: [ ARCH=x86_64, ASAN=none, BUILD_TYPE=Release, SSL=NO, GENERATOR="Unix Makefiles" ] - <<: *osx_xcode10_3 env: [ ARCH=x86_64, ASAN=address, BUILD_TYPE=Debug, SSL=YES, GENERATOR="Unix Makefiles" ] - <<: *osx_xcode10_3