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-macos-build-again'

Browse source 
* origin/topic/timw/fix-macos-build-again:
  CI: Remove commented openssl 1.1 workaround from macOS preparation script
  CI: Fix installation of python package on macOS
This commit is contained in:
Tim Wojtulewicz 2024-04-08 12:02:03 -07:00
commit 0438c8944d
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
7.0.0-dev.108 | 2024-04-08 12:02:03 -0700
* CI: Remove commented openssl 1.1 workaround from macOS preparation script (Tim Wojtulewicz, Corelight)
* CI: Fix installation of python package on macOS (Tim Wojtulewicz, Corelight)
* fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior (Vern Paxson, Corelight)
7.0.0-dev.102 | 2024-04-02 08:17:08 -0700
* fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.102
7.0.0-dev.108

13
ci/macos/prepare.sh
View file

@ -8,12 +8,9 @@ set -x
brew update
brew upgrade cmake
brew install openssl@3 swig bison flex ccache libmaxminddb
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 [ $(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