summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 23:09:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-26 23:09:20 (GMT)
commit48b21818ca5069285145b2fdb98f2e355637bb06 (patch)
treee97f11eecc907ed5c4aec8b0cb7d32fd149d25dc /.travis.yml
parentebc63580a1287325eef85e96c436de494406fd0a (diff)
parentf86f49bee9ba76a4fc3811748c1b4b1559c6fd4b (diff)
downloadgit-48b21818ca5069285145b2fdb98f2e355637bb06.zip
git-48b21818ca5069285145b2fdb98f2e355637bb06.tar.gz
git-48b21818ca5069285145b2fdb98f2e355637bb06.tar.bz2
Merge branch 'ls/travis-homebrew-path-fix'
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
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 477c3d2..37a1e1f 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