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 <steffan.karger@fox-it.com>
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 <gert@greenie.muc.de>
(cherry picked from commit 0c1b9864184e609b68c2bb317ee57317ae12a026)

diff --git a/.travis.yml b/.travis.yml
index 366e6599079fd4f4a96741405976ae9b09654e4a..5682eaadaa57a6894bc53858b569c78cf88f5128 100644 (file)
--- 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 e787ababa3f2ffbe15d9e04500ea8a9503e03aca..bc53885327d72fc6b8b323a3528367ed6f37162e 100755 (executable)
--- 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