Skip to content

Commit 672f51c

Browse files
larsxschneidergitster
authored andcommitted
travis-ci: fix Perforce install on macOS
The `perforce` and `perforce-server` package were moved from brew [1][2] to cask [3]. Teach TravisCI the new location. Perforce updates their binaries without version bumps. That made the brew install (legitimately!) fail due to checksum mismatches. The workaround is not necessary anymore as Cask [4] allows to disable the checksum test for individual formulas. [1] https://github.com/Homebrew/homebrew-binary/commit/1394e42de04d07445f82f9512627e864ff4ca4c6 [2] https://github.com/Homebrew/homebrew-binary/commit/f8da22d6b8dbcfcfdb2dfa9ac1a5e5d8e05aac2b [3] Homebrew/homebrew-cask#29180 [4] https://caskroom.github.io/ Signed-off-by: Lars Schneider <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ad36dc8 commit 672f51c

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

.travis.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,12 @@ before_install:
7575
popd
7676
;;
7777
osx)
78-
brew_force_set_latest_binary_hash () {
79-
FORMULA=$1
80-
SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
81-
sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
82-
"$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
83-
}
8478
brew update --quiet
85-
brew tap homebrew/binary --quiet
86-
brew_force_set_latest_binary_hash perforce
87-
brew_force_set_latest_binary_hash perforce-server
8879
# Uncomment this if you want to run perf tests:
8980
# brew install gnu-time
90-
brew install git-lfs perforce-server perforce gettext
81+
brew install git-lfs gettext
9182
brew link --force gettext
83+
brew install caskroom/cask/perforce
9284
;;
9385
esac;
9486
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)";

0 commit comments

Comments
 (0)