From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 6 Jul 2024 07:46:21 +0000 (-0700)
Subject: Try to fix some CI config issues on macOS (#2261)
X-Git-Tag: v3.7.5~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97c32b89b8a653527830122bc80eaa6b4fffb5f0;p=thirdparty%2Flibarchive.git

Try to fix some CI config issues on macOS (#2261)

macOS CI is reporting some warnings about unavailable versions of some
utilities. I'll take a stab at fixing those...
---

diff --git a/build/ci/github_actions/macos.sh b/build/ci/github_actions/macos.sh
index 6941bf873..b42ca0529 100755
--- a/build/ci/github_actions/macos.sh
+++ b/build/ci/github_actions/macos.sh
@@ -1,15 +1,13 @@
 #!/bin/sh
 if [ "$1" = "prepare" ]
 then
-	set -x
-	brew uninstall openssl@1.0.2t > /dev/null
-	brew uninstall python@2.7.17 > /dev/null
-	brew untap local/openssl > /dev/null
-	brew untap local/python2 > /dev/null
-	brew update > /dev/null
-	brew upgrade > /dev/null
 	set -x -e
-	for pkg in \
+	#Uncommenting these adds a full minute to the CI time
+	#brew update > /dev/null
+	#brew upgrade > /dev/null
+
+	# This does an upgrade if the package is already installed
+	brew install \
 		autoconf \
 		automake \
 		libtool \
@@ -20,7 +18,4 @@ then
 		zstd \
 		libxml2 \
 		openssl
-	do
-		brew list $pkg > /dev/null && brew upgrade $pkg || brew install $pkg
-	done
 fi