Merge upstream fix for osx-gcc job (#650)

I noticed the `osx-gcc` job failing in #647 so I found this upstream fix from @peff. Merging now to unblock PR builds in `microsoft/git`.
microsoft · May 14, 2024 · d9ecdb8 · d9ecdb8
2 parents 6f018f2 + 7df2405
commit d9ecdb8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -283,8 +283,7 @@ jobs:
             cc: clang
             pool: macos-13
           - jobname: osx-gcc
-            cc: gcc
-            cc_package: gcc-13
+            cc: gcc-13
             pool: macos-13
           - jobname: linux-gcc-default
             cc: gcc

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
@@ -34,8 +34,6 @@ 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"