From 625db810b405bbe9b2b47c0e172471f50a9a932b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Oct 2019 12:11:32 +0200 Subject: [PATCH] fixup! ci(osx): use new location of the `perforce` cask MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It still fails! *Still!* Even after upgrading the cask's definition in the PR https://github.com/Homebrew/homebrew-cask/pull/70981 does it fail. The explanation is, as Gábor Szeder dug out from the commit history: the local definitions might get stale and need to be updated. So let's just update them in case `brew cask install perforce` fails, and just try again! This will still fail, of course, when `homebrew-cask` falls behind Perforce's release schedule. But once it is updated, we can now simply re-run the failed jobs and they will pick up that update. As to updating `homebrew-cask`: I started automating this, via https://dev.azure.com/gitgitgadget/git/_build?definitionId=11&_a=summary (I plan on finishing it once the next Perforce upgrade comes around.) Signed-off-by: Johannes Schindelin --- ci/install-dependencies.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 7518376e205181..466c9b8ce3a01c 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -40,7 +40,11 @@ osx-clang|osx-gcc) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext - brew cask install perforce || + brew cask install perforce || { + # Update the definitions and try again + git -C "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask pull && + brew cask install perforce + } || brew install caskroom/cask/perforce case "$jobname" in osx-gcc)