From 6e3bd8a072d79b30c842ab67a0656e3a399e92f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 8 Jan 2020 10:58:58 +0000 Subject: [PATCH] travis.yml: duplicate before_script for MacOSX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rather than keep the hack in the global code lets "Think Different" and have a special copy for MacOSX. Signed-off-by: Alex Bennée --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 848a2714ef..6826618ea8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,6 @@ git: before_script: - - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi - if command -v ccache ; then ccache --zero-stats ; fi - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; } @@ -240,6 +239,11 @@ matrix: os: osx osx_image: xcode10.3 compiler: clang + before_script: + - export PATH="/usr/local/opt/ccache/libexec:$PATH" + - if command -v ccache ; then ccache --zero-stats ; fi + - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; } # Python builds