summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2016-09-21 10:45:18 +0200
committerJunio C Hamano <gitster@pobox.com>2016-09-22 10:23:01 -0700
commitf86f49bee9ba76a4fc3811748c1b4b1559c6fd4b (patch)
treeb3d23ad4810fc97717efdc4746ada731f77b5cbc
parent522354d70f4fab744f25bc3d641b478584bbfc3b (diff)
downloadgit-f86f49bee9ba76a4fc3811748c1b4b1559c6fd4b.tar.gz
travis-ci: ask homebrew for its path instead of hardcoding itls/travis-homebrew-path-fix
The TravisCI macOS build is broken because homebrew (a macOS dependency manager) changed its internal directory structure [1]. This is a problem because we modify the Perforce dependencies in the homebrew repository before installing them. Fix it by asking homebrew for its path instead of hardcoding it. [1] https://github.com/Homebrew/brew/commit/0a09ae30f8b6117ad699b4a0439010738989c547 Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c3bf9c6d4d..f0a89cb024 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ before_install:
FORMULA=$1
SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
- /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb
+ "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
}
brew update --quiet
brew tap homebrew/binary --quiet