Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 54 additions & 45 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,60 @@ queue_rules:
conditions:
- and: *CheckRuns
- schedule=Mon-Fri 09:00-17:30[Europe/Paris]
- name: duplicated lowprio from automatic merge for clifus version bump
queue_conditions:
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- author=mergify-ci-bot
- label!=manual merge
- "title~=^chore: bump"
- "#commits=1"
- head~=^clifus/
merge_conditions:
- and:
- check-success=linters
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
allow_inplace_checks: true
batch_size: 7
batch_max_wait_time: 5min
queue_branch_merge_method: fast-forward
merge_method: merge
- name: duplicated lowprio from automatic merge from trivy
queue_conditions:
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- head=trivy/daily-report
- author=mergify-ci-bot
- label!=manual merge
- label!=new CVE
- "#commits=1"
merge_conditions:
- and:
- check-success=linters
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
allow_inplace_checks: true
batch_size: 7
batch_max_wait_time: 5min
queue_branch_merge_method: fast-forward
commit_message_template:
merge_method: merge
- name: duplicated lowprio from automatic merge from dependabot
queue_conditions:
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- author=dependabot[bot]
- label!=manual merge
- "#commits=1"
merge_conditions:
- and:
- check-success=linters
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
allow_inplace_checks: true
batch_size: 7
batch_max_wait_time: 5min
queue_branch_merge_method: fast-forward
commit_message_template:
merge_method: merge
- name: lowprio
allow_inplace_checks: true
conditions:
Expand All @@ -19,8 +73,6 @@ queue_rules:
batch_size: 7
batch_max_wait_time: 5min
queue_branch_merge_method: fast-forward
disallow_checks_interruption_from_queues:
- default

pull_request_rules:
- name: automatic merge for hotfix
Expand Down Expand Up @@ -62,49 +114,6 @@ pull_request_rules:
- label!=manual merge
actions:
queue:

- name: automatic merge for clifus version bump
conditions:
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- author=mergify-ci-bot
- label!=manual merge
- "title~=^chore: bump"
- "#commits=1"
- head~=^clifus/
actions:
queue:
name: lowprio
method: merge

- name: automatic merge from trivy
conditions:
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- head=trivy/daily-report
- author=mergify-ci-bot
- label!=manual merge
- label!=new CVE
- "#commits=1"
actions:
queue:
name: lowprio
commit_message_template:
method: merge

- name: automatic merge from dependabot
conditions:
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- author=dependabot[bot]
- label!=manual merge
- "#commits=1"
actions:
queue:
name: lowprio
method: merge
commit_message_template:

- name: request review
conditions:
- -author=dependabot[bot]
Expand Down
Loading