From: Martin Matuska <martin@matuska.org>
Date: Mon, 2 Nov 2020 12:57:03 +0000 (+0100)
Subject: CI: fix homebrew errors in MacOS build
X-Git-Tag: v3.5.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a5488f08c6def7451871fd4af384c6f51d184cf;p=thirdparty%2Flibarchive.git

CI: fix homebrew errors in MacOS build
---

diff --git a/build/ci/github_actions/macos.sh b/build/ci/github_actions/macos.sh
index e51574cb6..ba72b4a77 100755
--- a/build/ci/github_actions/macos.sh
+++ b/build/ci/github_actions/macos.sh
@@ -1,9 +1,24 @@
 #!/bin/sh
 if [ "$1" = "prepare" ]
 then
-	set -x -e
+	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
-	for pkg in autoconf automake libtool pkg-config cmake xz lz4 zstd
+	brew upgrade > /dev/null
+	set -x -e
+	for pkg in \
+		autoconf \
+		automake \
+		libtool \
+		pkg-config \
+		cmake \
+		xz \
+		lz4 \
+		zstd \
+		openssl
 	do
 		brew list $pkg > /dev/null && brew upgrade $pkg || brew install $pkg
 	done