[PATCH v2 0/1] ci: update caskroom/cask/perforce to new location

["Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>]

Running CI on Mac OS X in Azure Pipelines is currently broken due to a moved
homebrew package.

Updates in V2: Johannes helped to make the step even more robust.

Thanks, -Stolee

Johannes Schindelin (1):
  ci(osx): use new location of the `perforce` cask

 ci/install-dependencies.sh | 5 +++++
 1 file changed, 5 insertions(+)


base-commit: 108b97dc372828f0e72e56bbb40cae8e1e83ece6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-400%2Fderrickstolee%2Fci-caskroom-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-400/derrickstolee/ci-caskroom-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/400

Range-diff vs v1:

 1:  84830d89eb ! 1:  372ab24acf ci(osx): use new location of the `perforce` cask
     @@ -9,21 +9,27 @@
              + brew install caskroom/cask/perforce
              Error: caskroom/cask was moved. Tap homebrew/cask-cask instead.
      
     -    Preface the "brew install caskroom/cask/perforce" with the old
     -    way of installing perforce, and only try this method if the
     -    "brew install perforce" fails.
     +    So let's try to call `brew cask install perforce` first (which is what
     +    that error message suggests, in a most round-about way).
      
     -    The existing way to use caskroom was added in 672f51cb (travis-ci:
     +    The "caskroom" way was added in 672f51cb (travis-ci:
          fix Perforce install on macOS, 2017-01-22) and the justification
     -    is that the "brew install perforce" can fail due to a hash
     -    mis-match. The mismatch is due to the official Perforce distro
     -    updating the published binaries without updating the version
     -    string. CI servers are typically fresh virtual machines, so that
     -    issue should not arise in automated builds.
     +    is that the call "brew cask install perforce" can fail due to a checksum
     +    mismatch: the recipe simply downloads the official Perforce distro, and
     +    whenever that is updated, the recipe needs to be updated, too.
      
     -    Even if a build server is re-used and hits the hash mis-match,
     -    it will fall back to the "new" mechanism which is currently
     -    failing, but may be fixed independently of this change.
     +    CI servers are typically fresh virtual machines, but not always. To
     +    accommodate for that, let's try harder if `brew cask install perforce`
     +    fails, by specifically pulling the latest `master` of the
     +    `homebrew-cask` repository.
     +
     +    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 for updating `homebrew-cask`: the beginnings of automating this in
     +    https://dev.azure.com/gitgitgadget/git/_build?definitionId=11&_a=summary
     +    will be finished once the next Perforce upgrade comes around.
      
          Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
          Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
     @@ -35,7 +41,11 @@
       	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)

-- 
gitgitgadget