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/fetchcontent_mkdir'

Browse source 
* origin/topic/timw/fetchcontent_mkdir:
  CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure
  Update broker and cmake submodules [nomail]
This commit is contained in:
Tim Wojtulewicz 2024-07-12 16:02:22 -07:00
commit cb56837f07
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -10,7 +10,7 @@ btest_jobs: &BTEST_JOBS 4
btest_retries: &BTEST_RETRIES 2 btest_retries: &BTEST_RETRIES 2
memory: &MEMORY 16GB memory: &MEMORY 16GB
config: &CONFIG --build-type=release --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror config: &CONFIG --build-type=release --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
no_spicy_config: &NO_SPICY_CONFIG --build-type=release --disable-broker-tests --disable-spicy --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror no_spicy_config: &NO_SPICY_CONFIG --build-type=release --disable-broker-tests --disable-spicy --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror
static_config: &STATIC_CONFIG --build-type=release --disable-broker-tests --enable-static-broker --enable-static-binpac --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror static_config: &STATIC_CONFIG --build-type=release --disable-broker-tests --enable-static-broker --enable-static-binpac --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror
binary_config: &BINARY_CONFIG --prefix=$CIRRUS_WORKING_DIR/install --libdir=$CIRRUS_WORKING_DIR/install/lib --binary-package --enable-static-broker --enable-static-binpac --disable-broker-tests --build-type=Release --ccache --enable-werror binary_config: &BINARY_CONFIG --prefix=$CIRRUS_WORKING_DIR/install --libdir=$CIRRUS_WORKING_DIR/install/lib --binary-package --enable-static-broker --enable-static-binpac --disable-broker-tests --build-type=Release --ccache --enable-werror

10
CHANGES
View file

@ -1,3 +1,13 @@
7.1.0-dev.10 | 2024-07-12 16:02:22 -0700
* CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure (Tim Wojtulewicz, Corelight)
* Fix a broken merge (Tim Wojtulewicz, Corelight)
I merged an old version of the branch on accident and then merged the right
one over top of it, but git ended up including both versions. This fixes
that mistake.
7.1.0-dev.6 | 2024-07-12 09:51:39 -0700 7.1.0-dev.6 | 2024-07-12 09:51:39 -0700
* Do not emit hook files for builtin modules (Benjamin Bannier, Corelight) * Do not emit hook files for builtin modules (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.6 7.1.0-dev.10

2
auxil/broker

@ -1 +1 @@
Subproject commit fada26ae504981f7f5524bf2a5c82ae49acd556d Subproject commit 4d19d25dc9b3d6b89ea16ae14e1100f10d156551

2
cmake

@ -1 +1 @@
Subproject commit 690483f76c149ffa8e035b612b406b0964f9886f Subproject commit 2d42baf8e63a7494224aa9d02afa2cb43ddb96b8