Skip to content

Commit

Permalink
Merge branch 'topic/timw/fetchcontent_mkdir'
Browse files Browse the repository at this point in the history
* topic/timw/fetchcontent_mkdir:
  CI: Only use Sonoma for macOS
  CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure
  Update cmake submodule [nomail]
  • Loading branch information
timwoj committed Jul 12, 2024
2 parents fada26a + 8d9de52 commit 4d19d25
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
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
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2.8.0-dev.97 | 2024-07-12 15:04:40 -0700

* CI: Only use Sonoma for macOS (Tim Wojtulewicz, Corelight)

* CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure (Tim Wojtulewicz, Corelight)

2.8.0-dev.93 | 2024-07-11 12:11:26 -0700

* Add safety checks for accessing registry pointers (Dominik Charousset, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.0-dev.93
2.8.0-dev.97
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 1 files
+2 −1 ZeekBundle.cmake

0 comments on commit 4d19d25

Please sign in to comment.