Merge dd092d7 into 664ed1d

.travis.yml

@@ -1,9 +1,10 @@
 language: cpp
 cache:
   timeout: 600
-  ccache: true
+  ccache: false
   directories:
     - $HOME/Library/Caches/Homebrew
+    - ${HOME}/.homebrew-cache
 dist: xenial
 sudo: false
 addons:
@@ -43,6 +44,7 @@ env:
   - secure: CaZAZW5shaYve0gauA0rdRn/Bxdf5itfAFb7FuaOHmk999AQ/aB013huCcdeeBDhon2CxQ3BRLTkRzHR00DBA7rPgR1Y/4/kHa71xisUY7CqDlHYktQI69CpqGot2Bb1eE2Rs7ZQcYKhfMbMJacE6zNBZwUq0I0OWI1Ux3PKkJs=
   - secure: bbgK1psr0ZUYPJanjnyzsbkQk2QHLkS39iiycnb4GVUUlNKRcdxqEFqoVFssOKvrQQr2RVe/k8RSb9D57KiCiQaAqksnmGJ9nTDNiNJefgTO+bTjGVIzBSyMyLDX/ltQkyHm5bBF48+64sAv5jYkbfgfj9H0/ihtwt6wqh5AdJQ=
   - secure: N4fBA3ul3DBM0/RJjQ+R64EGoQb9AaKmvgyFq9TdTT4JQ2TB956yHq/iwOfnYAjY0zW238lWE1n+mlQlKwW7MrOPlZylsKO1oBTjEkm8d7SezPnLZWPBB5tGv1wrWOcI+k1nYFPPRFtTopcCwvLyFoN7d/Z7ViuqNAK8QSzCKps=
+  - HOMEBREW_AUTO_UPDATE_SECS=86400
 git:
   submodules: false # We selectively pull in the wanted submodules ourselves now
 matrix:
@@ -124,15 +126,15 @@ matrix:
         - qt511base
         - qt511multimedia
         - qt511tools
-before_cache:
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
 before_install:
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ] && [ -d "${HOME}/.homebrew-cache" ]; then cp -f -R "${HOME}/.homebrew-cache" "/usr/local/Homebrew"; fi
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | tee -a "${HOME}/ca-file.pem"; fi
   # add to the path here to pick up things as soon as its installed
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export PATH="${HOME}/.npm-global/bin:${HOME}/latest-gcc-symlinks:$PATH"; fi
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then source "/opt/qt${QT_VERSION}/bin/qt${QT_VERSION}-env.sh"; fi
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval $(luarocks path); fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then PATH="${HOME}/.npm-global/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/qt5/bin:$PATH"; fi
+  # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then PATH="${HOME}/.npm-global/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/qt5/bin:$PATH"; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then PATH="${HOME}/.npm-global/bin:/usr/local/opt/qt5/bin:$PATH"; fi
   # homebrew upgrades dependents when upgrading packages, which leads to an gdal upgrade, which in turn pulls a loooong list of other dependencies. Avoid that
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew pin gdal; brew pin postgis; fi
   - ./CI/travis.before_install.sh
@@ -146,6 +148,17 @@ before_script: |
   mkdir -p build
 script:
 - ./CI/travis.compile.sh
+
+before_cache:
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
+# Credit https://discourse.brew.sh/t/best-practice-for-homebrew-on-travis-brew-update-is-5min-to-build-time/5215/9
+# Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build
+# Find workaround on macOS due to https://superuser.com/a/1459901/151744
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then rm -rf "${HOME}/.homebrew-cache" && cp -f -R "/usr/local/Homebrew" "${HOME}/.homebrew-cache"; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then cd "${HOME}/.homebrew-cache" && find . \! -regex ".+\.git.+" -delete; fi
+  # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install tree && tree -a -h "/usr/local/Homebrew"; fi
+  # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install tree && tree -a -h "/usr/local/Homebrew"; fi
+
 after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   - bash CI/travis.after_success.sh

CI/travis.osx.before_install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 set -ev
-brew update
+brew update --verbose