diff --git a/.cirrus.yml b/.cirrus.yml index 3e349974f0..8c3a07df1b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -296,6 +296,13 @@ ubuntu22_task: upload_binary_artifacts: path: build.tgz benchmark_script: ./ci/benchmark.sh + # Run on PRs, merges to master and release/.* and benchmark-nightly cron. + only_if: > + ( $CIRRUS_PR != '' && $CIRRUS_BRANCH !=~ 'dependabot/.*' ) || + ( ( $CIRRUS_REPO_NAME == 'zeek' || $CIRRUS_REPO_NAME == 'zeek-security' ) && + $CIRRUS_BRANCH == 'master' || + $CIRRUS_BRANCH =~ 'release/.*' || + $CIRRUS_CRON == 'benchmark-nightly' ) ubuntu22_spicy_task: container: diff --git a/CHANGES b/CHANGES index b138eb95ad..31ae491347 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +6.1.0-dev.462 | 2023-09-28 20:29:36 +0200 + + * cirrus/ci: Run ubuntu22_task on benchmark-nightly, too (Arne Welzel, Corelight) + 6.1.0-dev.460 | 2023-09-28 10:00:55 +0200 * Fix GCC warnings about unintended pointer comparisions (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index 76304e8795..bf30820899 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.1.0-dev.460 +6.1.0-dev.462