From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 May 2024 17:19:47 +0000 (-0700)
Subject: Merge branch 'jk/ci-macos-gcc13-fix'
X-Git-Tag: v2.46.0-rc0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cb0bd7fc3bee82d38d8cf99b9e1bbfa4d35a845;p=thirdparty%2Fgit.git

Merge branch 'jk/ci-macos-gcc13-fix'

CI fix.

* jk/ci-macos-gcc13-fix:
  ci: stop installing "gcc-13" for osx-gcc
  ci: avoid bare "gcc" for osx-gcc job
  ci: drop mention of BREW_INSTALL_PACKAGES variable
---

6cb0bd7fc3bee82d38d8cf99b9e1bbfa4d35a845
diff --cc ci/install-dependencies.sh
index c196e56762,fa0c00c606..2e7688ae8b
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -69,15 -34,14 +69,13 @@@ macos-*
  	export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
  	# Uncomment this if you want to run perf tests:
  	# brew install gnu-time
- 	test -z "$BREW_INSTALL_PACKAGES" ||
- 	brew install $BREW_INSTALL_PACKAGES
  	brew link --force gettext
  
 -	mkdir -p "$P4_PATH"
 -	pushd "$P4_PATH"
 -		wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
 -		tar -xf helix-core-server.tgz &&
 -		sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
 -	popd
 +	mkdir -p "$CUSTOM_PATH"
 +	wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
 +	tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
 +	sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
 +	rm helix-core-server.tgz
  
  	if test -n "$CC_PACKAGE"
  	then