From 167cbaf6e47e9f56e2475f3cb7782244ff261f05 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 8 Apr 2024 10:26:10 -0700 Subject: [PATCH 1/2] CI: Fix installation of python package on macOS --- ci/macos/prepare.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh index 52c4472272..7735a9a04a 100755 --- a/ci/macos/prepare.sh +++ b/ci/macos/prepare.sh @@ -8,7 +8,12 @@ set -x brew update brew upgrade cmake brew install openssl@3 swig bison flex ccache libmaxminddb -python3 -m pip install --user websockets + +if [ $(sw_vers -productVersion | cut -d '.' -f 1) -lt 14 ]; then + python3 -m pip install --upgrade pip +fi + +python3 -m pip install --user --break-system-packages websockets # Brew doesn't create the /opt/homebrew/opt/openssl symlink if you install # openssl@1.1, only with 3.0. Create the symlink if it doesn't exist. From 24916508730c1dc8373ec4cb3944c4083f1f023c Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 8 Apr 2024 10:47:24 -0700 Subject: [PATCH 2/2] CI: Remove commented openssl 1.1 workaround from macOS preparation script --- ci/macos/prepare.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh index 7735a9a04a..a96833f75f 100755 --- a/ci/macos/prepare.sh +++ b/ci/macos/prepare.sh @@ -14,11 +14,3 @@ if [ $(sw_vers -productVersion | cut -d '.' -f 1) -lt 14 ]; then fi python3 -m pip install --user --break-system-packages websockets - -# Brew doesn't create the /opt/homebrew/opt/openssl symlink if you install -# openssl@1.1, only with 3.0. Create the symlink if it doesn't exist. -#if [ ! -e /opt/homebrew/opt/openssl ]; then -# if [ -d /opt/homebrew/opt/openssl@1.1 ]; then -# ln -s /opt/homebrew/opt/openssl@1.1 /opt/homebrew/opt/openssl -# fi -#fi