diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-01 00:15:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-01 00:15:00 +0300 |
| commit | 4e170adc8ad654bddb9421a4bf51bb4802656262 (patch) | |
| tree | d944ee6f827b581e2cdbc6518d240405b493f0a6 | |
| parent | a49260b17d39434bbdf5d55991c90aa2f42ea64c (diff) | |
| parent | 672f51cb83300d1feba8fb00b19afa3b335b2106 (diff) | |
Merge branch 'ls/travis-p4-on-macos'
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.yml | 12 |
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)"; |