Merge branch 'jk/ci-macos-gcc13-fix' into 'maint-2.39'

dscho · dscho · commit ecc86167d348 · 2024-05-21T22:42:07.000+02:00
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 This is a backport of 6cb0bd7 (Merge branch 'jk/ci-macos-gcc13-fix', 2024-05-13) to allow the CI job `osx-gcc` to succeed again.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -264,8 +264,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 $HOME/bin
 	(

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ macos-*)`
`34`	`34`	`export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1`
`35`	`35`	`# Uncomment this if you want to run perf tests:`
`36`	`36`	`# brew install gnu-time`
`37`		`- test -z "$BREW_INSTALL_PACKAGES" \|\|`
`38`		`- brew install $BREW_INSTALL_PACKAGES`
`39`	`37`	`brew link --force gettext`
`40`	`38`	`mkdir -p $HOME/bin`
`41`	`39`	`(`