diff --git a/CHANGES b/CHANGES index 3d36d8a8f2..d69995248e 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Update binpac submodule for modernization fixes [nomail] (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 346a8e3026..792257121c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.0-dev.14 +6.0.0-dev.22 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