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

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
This commit is contained in:
Arne Welzel 2023-02-10 10:25:37 +01:00
commit 6047846353
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
6.0.0-dev.22 | 2023-02-10 10:25:37 +0100
* CI: Call 'brew install' for macOS to ensure we're using openssl@3 on all hosts (Tim Wojtulewicz, Corelight)
* Remove files in build/src/3rdparty from coverage reports (Tim Wojtulewicz, Corelight)
6.0.0-dev.14 | 2023-02-07 10:29:28 -0700 6.0.0-dev.14 | 2023-02-07 10:29:28 -0700
* Update binpac submodule for modernization fixes [nomail] (Tim Wojtulewicz, Corelight) * Update binpac submodule for modernization fixes [nomail] (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.14 6.0.0-dev.22

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