travis-ci: ask homebrew for its path instead of hardcoding it
authorLars Schneider <larsxschneider@gmail.com>
Wed, 21 Sep 2016 08:45:18 +0000 (10:45 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Sep 2016 17:23:01 +0000 (10:23 -0700)
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>
.travis.yml
index c3bf9c6d4d1c6049dd38a5a861dceb4c8e1b7e99..f0a89cb024f2a978379865ed2e9fd3f559e05e4a 100644 (file)
@@ -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