Re: [PATCH v1] travis-ci: fix Perforce install on macOS
From: Junio C Hamano <hidden>
Date: 2017-01-23 18:22:59
larsxschneider@gmail.com writes:
Could you fast track the patch to `maint` if it works without trouble on
`next` (as it should!)?
Notes:
Base Commit: 787f75f056 (master)I do not think there is any difference between 'maint' and 'master' for this file right now, but I still would have appreciated if this line also said 'maint', not 'master', if you want it to go to 'maint' eventually ;-) As https://travis-ci.org/git/git/builds seems to be doing 'pu', too, hopefully we'll catch any issues there first. Thanks.
quoted hunk
Diff on Web: https://github.com/larsxschneider/git/commit/ec7106339d Checkout: git fetch https://github.com/larsxschneider/git travisci/brew-perforce-fix-v1 && git checkout ec7106339d .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)diff --git a/.travis.yml b/.travis.yml index 3843967a69..c6ba8c8ec5 100644 --- a/.travis.yml +++ b/.travis.yml@@ -75,20 +75,13 @@ 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)"; --2.11.0