From c926ba1dc4f7517d411a80eac7764e84337d3ebd Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 26 Dec 2018 11:55:26 -0500 Subject: [PATCH] ci: use homebrew addon to simplify shell scripts --- .travis.yml | 5 +++++ ci/before_install.sh | 4 ---- ci/install.sh | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5514b1298a..93caf9ef75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,6 +117,11 @@ addons: - unzip - valgrind - xclip + homebrew: + update: true + packages: + - ccache + - ninja branches: only: diff --git a/ci/before_install.sh b/ci/before_install.sh index 86dd78af48..d8cf38d314 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -7,10 +7,6 @@ if [[ "${CI_TARGET}" == lint ]]; then exit fi -if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - >/dev/null brew update -fi - echo 'python info:' ( 2>&1 python --version || true diff --git a/ci/install.sh b/ci/install.sh index 7efbaf33b5..3eea63315d 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -8,8 +8,6 @@ if [[ "${CI_TARGET}" == lint ]]; then fi if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - brew install ccache - brew install ninja export PATH="/usr/local/opt/ccache/libexec:$PATH" fi