From b968f43f9142f832483ae91c8b4e44a5c9efed57 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 5 Jan 2018 00:37:10 +0500 Subject: [PATCH] travis-ci: add brew cache, remove ccache 1-2 minutes speedup osx builds by using brew cache. Also, ccache was removed for a while (builds fail after travis-ci upgraded clang to version 5.0.0) Acked-by: Steffan Karger Message-Id: <20180104193710.23778-1-chipitsine@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16154.html Signed-off-by: Gert Doering (cherry picked from commit 0c1b9864184e609b68c2bb317ee57317ae12a026) --- .travis.yml | 2 +- .travis/build-deps.sh | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 366e65990..5682eaada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,10 +81,10 @@ addons: - man2html cache: - ccache: true directories: - download-cache - ${HOME}/opt + - ${HOME}/Library/Caches/Homebrew before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update ; fi diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh index e787ababa..bc5388532 100755 --- a/.travis/build-deps.sh +++ b/.travis/build-deps.sh @@ -130,16 +130,6 @@ build_openssl () { fi } -# Enable ccache -if [ "${TRAVIS_OS_NAME}" != "osx" ] && [ -z ${CHOST+x} ]; then - # ccache not available on osx, see: - # https://github.com/travis-ci/travis-ci/issues/5567 - # also ccache not enabled for cross builds - mkdir -p "${HOME}/bin" - ln -s "$(which ccache)" "${HOME}/bin/${CC}" - PATH="${HOME}/bin:${PATH}" -fi - if [ ! -z ${CHOST+x} ]; then # # openvpn requires at least mingw-gcc-4.9, which is available at xenial repo -- 2.47.2