From 2fdc740bd044a457b47fa738f7b4fba4564b044c Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 10 Feb 2023 10:25:37 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/timw/fix-cirrus-macos-builds' * origin/topic/timw/fix-cirrus-macos-builds: CI: Call 'brew install' for macOS to ensure we're using openssl@3 on all hosts (cherry picked from commit 604784635383b06222f72610a2ee75cdcaf0a448) --- CHANGES | 2 +- ci/macos/prepare.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 2a8058bdfb..320d7ac2ab 100644 --- a/CHANGES +++ b/CHANGES @@ -389,7 +389,7 @@ Using "in" to query the language const. This also handles the case of not having a best guess and continue using the existing behavior. - + Given keyboard_layout = 1033 (0x0409), "keyboard-English - United States" keyboard_layout = 66569 (0x00010409), "keyboard-English - United States (Best Guess)" diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh index 8203593813..6d3909a90d 100755 --- a/ci/macos/prepare.sh +++ b/ci/macos/prepare.sh @@ -6,14 +6,14 @@ set -e set -x brew update -brew upgrade cmake openssl@1.1 -brew install swig bison flex ccache +brew upgrade cmake +brew install openssl@3 swig bison flex ccache python3 -m pip install --user 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 +#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