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/timw/zeek-security-master-builds'

Browse source 
* origin/topic/timw/zeek-security-master-builds:
  Ensure master/release builds run for zeek-security
This commit is contained in:
Arne Welzel 2023-03-23 13:40:26 +01:00
commit 71f487bd20
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -61,7 +61,7 @@ builds_only_if_template: &BUILDS_ONLY_IF_TEMPLATE
( $CIRRUS_CRON == '' ) && ( $CIRRUS_CRON == '' ) &&
( $CIRRUS_REPO_NAME != 'zeek-security' || $CIRRUS_OS != "darwin" ) && ( $CIRRUS_REPO_NAME != 'zeek-security' || $CIRRUS_OS != "darwin" ) &&
( ( $CIRRUS_PR != '' && $CIRRUS_BRANCH !=~ 'dependabot/.*' ) || ( ( $CIRRUS_PR != '' && $CIRRUS_BRANCH !=~ 'dependabot/.*' ) ||
( $CIRRUS_REPO_NAME == 'zeek' && ( ( $CIRRUS_REPO_NAME == 'zeek' || $CIRRUS_REPO_NAME == 'zeek-security' ) &&
( (
$CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH == 'master' ||
$CIRRUS_BRANCH =~ 'release/.*' $CIRRUS_BRANCH =~ 'release/.*'

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.268 | 2023-03-23 13:40:26 +0100
* Ensure master/release builds run for zeek-security (Tim Wojtulewicz, Corelight)
6.0.0-dev.266 | 2023-03-23 13:35:28 +0100 6.0.0-dev.266 | 2023-03-23 13:35:28 +0100
* iosource: Remove non-existing ManagerBase friend (Arne Welzel, Corelight) * iosource: Remove non-existing ManagerBase friend (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.266 6.0.0-dev.268