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

Merge remote-tracking branch 'origin/topic/awelzel/ci-macos-sonoma-only'

Browse source 
* origin/topic/awelzel/ci-macos-sonoma-only:
  CMakeLists: Ensure Threads::Threads target exists
  ci/macos: Only use sonoma image
This commit is contained in:
Arne Welzel 2024-07-04 17:34:23 +02:00
commit 66cdb490ff
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.cirrus.yml
View file

@ -338,18 +338,15 @@ alpine_task:
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
# Apple doesn't publish official long-term support timelines. # Cirrus only supports the following macos runner currently, selecting
# We aim to support both the current and previous macOS release. # anything else automatically upgrades to this one.
#
# ghcr.io/cirruslabs/macos-runner:sonoma
#
# See also: https://cirrus-ci.org/guide/macOS/
macos_sonoma_task: macos_sonoma_task:
macos_instance: macos_instance:
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest image: ghcr.io/cirruslabs/macos-runner:sonoma
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT
macos_ventura_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-base:latest
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT << : *MACOS_ENVIRONMENT

9
CHANGES
View file

@ -1,3 +1,12 @@
7.0.0-dev.434 | 2024-07-04 17:34:23 +0200
* CMakeLists: Ensure Threads::Threads target exists (Arne Welzel, Corelight)
Fix failure on OSX with CMake 3.30 complaining about missing
Threads::Threads target.
* ci/macos: Only use sonoma image (Arne Welzel, Corelight)
7.0.0-dev.431 | 2024-07-04 17:22:42 +0200 7.0.0-dev.431 | 2024-07-04 17:22:42 +0200
* Bump auxil/zeek-aux (Benjamin Bannier, Corelight) * Bump auxil/zeek-aux (Benjamin Bannier, Corelight)

8
CMakeLists.txt
View file

@ -306,6 +306,9 @@ function (zeek_add_dependencies dep)
endforeach () endforeach ()
endfunction () endfunction ()
# Used by library zeek_dynamic_plugin_base and for sanitizer builds.
find_package(Threads REQUIRED)
# Interface library for propagating extra flags and include paths to dynamically # Interface library for propagating extra flags and include paths to dynamically
# loaded plugins. Also propagates include paths and C++17 mode on the install # loaded plugins. Also propagates include paths and C++17 mode on the install
# interface. # interface.
@ -640,11 +643,6 @@ if (NOT BINARY_PACKAGING_MODE)
endif () endif ()
if (ZEEK_SANITIZERS) if (ZEEK_SANITIZERS)
# Check the thread library info early as setting compiler flags seems to
# interfere with the detection and cause CMAKE_THREAD_LIBS_INIT to not include
# -lpthread when it should.
find_package(Threads)
string(REPLACE "," " " _sanitizer_args "${ZEEK_SANITIZERS}") string(REPLACE "," " " _sanitizer_args "${ZEEK_SANITIZERS}")
separate_arguments(_sanitizer_args) separate_arguments(_sanitizer_args)
set(ZEEK_SANITIZERS "") set(ZEEK_SANITIZERS "")

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.431 7.0.0-dev.434