Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/fix-cirrus-macos-builds'

Browse source 
* 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 6047846353)
This commit is contained in:
Arne Welzel 2023-02-10 10:25:37 +01:00 • committed by Tim Wojtulewicz
parent dc4b8b958c
commit 2fdc740bd0
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -389,7 +389,7 @@
Using "in" to query the language const. This also handles the case of not Using "in" to query the language const. This also handles the case of not
having a best guess and continue using the existing behavior. having a best guess and continue using the existing behavior.
Given Given
keyboard_layout = 1033 (0x0409), "keyboard-English - United States" keyboard_layout = 1033 (0x0409), "keyboard-English - United States"
keyboard_layout = 66569 (0x00010409), "keyboard-English - United States (Best Guess)" keyboard_layout = 66569 (0x00010409), "keyboard-English - United States (Best Guess)"

14
ci/macos/prepare.sh
View file

@ -6,14 +6,14 @@ set -e
set -x set -x
brew update brew update
brew upgrade cmake openssl@1.1 brew upgrade cmake
brew install swig bison flex ccache brew install openssl@3 swig bison flex ccache
python3 -m pip install --user websockets python3 -m pip install --user websockets
# Brew doesn't create the /opt/homebrew/opt/openssl symlink if you install # 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. # openssl@1.1, only with 3.0. Create the symlink if it doesn't exist.
if [ ! -e /opt/homebrew/opt/openssl ]; then #if [ ! -e /opt/homebrew/opt/openssl ]; then
if [ -d /opt/homebrew/opt/openssl@1.1 ]; then # if [ -d /opt/homebrew/opt/openssl@1.1 ]; then
ln -s /opt/homebrew/opt/openssl@1.1 /opt/homebrew/opt/openssl # ln -s /opt/homebrew/opt/openssl@1.1 /opt/homebrew/opt/openssl
fi # fi
fi #fi