Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cmake submodule to fix Zeek configure failures with FETCHCONTENT_FULLY_DISCONNECTED flag #419

Merged
merged 3 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
cpus: &CPUS 8
memory: &MEMORY 24GB

config: &CONFIG --build-type=release --enable-static
memcheck_config: &MEMCHECK_CONFIG --build-type=debug --sanitizers=address
config: &CONFIG --build-type=release --enable-static -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
memcheck_config: &MEMCHECK_CONFIG --build-type=debug --sanitizers=address -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON

resources_template: &RESOURCES_TEMPLATE
cpu: *CPUS
Expand Down Expand Up @@ -161,18 +161,15 @@ alpine_task:
<< : *CI_TEMPLATE
<< : *UNIX_ENV

# Apple doesn't publish official long-term support timelines.
# We aim to support both the current and previous macOS release.
# Cirrus only supports the following macos runner currently, selecting
# 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_instance:
image: ghcr.io/cirruslabs/macos-sonoma-base:latest
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE

macos_ventura_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-base:latest
image: ghcr.io/cirruslabs/macos-runner:sonoma
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE
Expand Down
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 1 files
+2 −1 ZeekBundle.cmake
Loading