summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-31 13:32:04 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-31 13:32:04 -0800
commitaf1a71f11646f6d32a36f0b68183c1e24d37f808 (patch)
tree7b6179f549e5872b1e276d343f25d6614125aa7f
parentfccb41391f6fd00b7facf2983ff5db94d1780de7 (diff)
parent672f51cb83300d1feba8fb00b19afa3b335b2106 (diff)
downloadgit-af1a71f11646f6d32a36f0b68183c1e24d37f808.tar.gz
Merge branch 'ls/travis-p4-on-macos' into maint
Update the definition of the MacOSX test environment used by TravisCI. * ls/travis-p4-on-macos: travis-ci: fix Perforce install on macOS
-rw-r--r--.travis.yml12
1 files changed, 2 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 3843967a69..9c63c8c3f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,20 +75,12 @@ before_install:
popd
;;
osx)
- brew_force_set_latest_binary_hash () {
- 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" \
- "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
- }
brew update --quiet
- brew tap homebrew/binary --quiet
- brew_force_set_latest_binary_hash perforce
- brew_force_set_latest_binary_hash perforce-server
# Uncomment this if you want to run perf tests:
# brew install gnu-time
- brew install git-lfs perforce-server perforce gettext
+ brew install git-lfs gettext
brew link --force gettext
+ brew install caskroom/cask/perforce
;;
esac;
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)";