Re: [PATCH v3 1/1] ci(osx): use new location of the `perforce` cask
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 20, 2019, 10:59 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1911201157500.15956@tvgsbejvaqbjf.bet>
- In-Reply-To
- <xmqqk17ve45s.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 20 Nov 2019, Junio C Hamano wrote:
Show 32 quoted lines
> -- >8 --
> Subject: ci(osx): update homebrew-cask repository with less noise
>
> The OSX CI build procedure updates the homebrew-cask repository
> before attempting to install perforce again, after seeing an
> installation failure. This involves a "git pull" that by default
> computes and outputs diffstat, which would only grow as the time
> goes by and the repository cast in stone in the CI build image
> becomes more and more stale relative to the upstream repository in
> the outside world.
>
> Suppress the diffstat to both save cycles to generate it, and strain
> on the eyeballs to skip it.
>
> Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> ci/install-dependencies.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
> index 4e64a19112..b6b4f4707f 100755
> --- a/ci/install-dependencies.sh
> +++ b/ci/install-dependencies.sh
> @@ -42,7 +42,8 @@ osx-clang|osx-gcc)
> brew link --force gettext
> brew cask install perforce || {
> # Update the definitions and try again
> - git -C "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask pull &&
> + cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
> + git -C "$cask_repo" pull --no-stat &&Even better! I missed that option because I usually read `Documentation/git-<command>.txt` directly, and of course that is in the included `Documentation/merge-options.txt`...
Thank you, Dscho
> brew cask install perforce > } || > brew install caskroom/cask/perforce >