summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMartin Matuska <martin@matuska.org>2020-11-02 13:57:03 +0100
committerMartin Matuska <martin@matuska.org>2020-11-02 13:57:03 +0100
commit9a5488f08c6def7451871fd4af384c6f51d184cf (patch)
tree256c52f9f561a53f215267e2bdd3bdf87e77716d /build
parent18c0af5f9e699367d62c39655f1bef513ca713db (diff)
downloadlibarchive-9a5488f08c6def7451871fd4af384c6f51d184cf.tar.gz
CI: fix homebrew errors in MacOS build
Diffstat (limited to 'build')
-rwxr-xr-xbuild/ci/github_actions/macos.sh19
1 files changed, 17 insertions, 2 deletions
diff --git a/build/ci/github_actions/macos.sh b/build/ci/github_actions/macos.sh
index e51574cb..ba72b4a7 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