Merge remote-tracking branch 'origin/topic/timw/ci-ignore-dependabot-prs'

* origin/topic/timw/ci-ignore-dependabot-prs:
  Ignore dependabot PRs on Cirrus
This commit is contained in:
Tim Wojtulewicz 2022-06-14 14:39:02 -07:00
commit d8cfdba71a
3 changed files with 6 additions and 2 deletions

View file

@ -54,7 +54,7 @@ sanitizers_resource_template: &SANITIZERS_RESOURCE_TEMPLATE
ci_template: &CI_TEMPLATE
only_if: >
$CIRRUS_PR != '' ||
( $CIRRUS_PR != '' && $CIRRUS_BRANCH != 'dependabot/.*' ) ||
( $CIRRUS_REPO_NAME == 'zeek' &&
(
$CIRRUS_BRANCH == 'master' ||

View file

@ -1,3 +1,7 @@
5.1.0-dev.35 | 2022-06-14 14:39:02 -0700
* Ignore dependabot PRs on Cirrus (Tim Wojtulewicz, Corelight)
5.1.0-dev.33 | 2022-06-14 14:34:31 -0700
* Merge PQ_Timer into base TimerMgr class (Tim Wojtulewicz, Corelight)

View file

@ -1 +1 @@
5.1.0-dev.33
5.1.0-dev.35