mirror of
https://github.com/zeek/zeek.git
synced 2025-10-15 13:08:20 +00:00
Merge remote-tracking branch 'origin/topic/awelzel/ubuntu22-on-benchmark-nightly'
* origin/topic/awelzel/ubuntu22-on-benchmark-nightly: cirrus/ci: Run ubuntu22_task on benchmark-nightly, too
This commit is contained in:
commit
409f40270f
3 changed files with 12 additions and 1 deletions
|
@ -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:
|
||||
|
|
4
CHANGES
4
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)
|
||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
6.1.0-dev.460
|
||||
6.1.0-dev.462
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue