diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:45 -0700 |
| commit | d2a4131ec43f78c808e3f2b716f6d7e22cc2589e (patch) | |
| tree | 8ab28793ff291f392088a0a63bdfaf3184d428e0 | |
| parent | Merge branch 'js/regexec-buf' into maint (diff) | |
| parent | travis-ci: ask homebrew for its path instead of hardcoding it (diff) | |
| download | tgif-d2a4131ec43f78c808e3f2b716f6d7e22cc2589e.tar.xz | |
Merge branch 'ls/travis-homebrew-path-fix' into maint
The procedure to build Git on Mac OS X for Travis CI hardcoded the
internal directory structure we assumed HomeBrew uses, which was a
no-no. The procedure has been updated to ask HomeBrew things we
need to know to fix this.
* ls/travis-homebrew-path-fix:
travis-ci: ask homebrew for its path instead of hardcoding it
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 477c3d2efb..37a1e1fb6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,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 |