diff --git a/.cirrus.yml b/.cirrus.yml index b63b0c4d3e..4f2df29803 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -61,7 +61,7 @@ builds_only_if_template: &BUILDS_ONLY_IF_TEMPLATE ( $CIRRUS_CRON == '' ) && ( $CIRRUS_REPO_NAME != 'zeek-security' || $CIRRUS_OS != "darwin" ) && ( ( $CIRRUS_PR != '' && $CIRRUS_BRANCH !=~ 'dependabot/.*' ) || - ( $CIRRUS_REPO_NAME == 'zeek' && + ( ( $CIRRUS_REPO_NAME == 'zeek' || $CIRRUS_REPO_NAME == 'zeek-security' ) && ( $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH =~ 'release/.*' diff --git a/CHANGES b/CHANGES index c7eb3f6f70..a82755f479 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * iosource: Remove non-existing ManagerBase friend (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index d139a5e0a6..a76f6d54fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.0-dev.266 +6.0.0-dev.268