Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Oct 31, 2024
1 parent 2f1a92b commit 5d8ceb2
Showing 1 changed file with 41 additions and 30 deletions.
71 changes: 41 additions & 30 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,45 @@ queue_rules:
conditions:
- and: *CheckRuns
- schedule=Mon-Fri 09:00-17:30[Europe/Paris]
- name: duplicated lowprio from automatic merge from trivy
allow_inplace_checks: true
conditions:
- and:
- check-success=linters
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
- and: &CheckRuns

Check failure on line 20 in .mergify.yml

View check run for this annotation

Mergify / Configuration changed

Invalid YAML

found duplicate anchor; first occurrence in "<unicode string>", line 7, column 14 second occurrence in "<unicode string>", line 20, column 14
- check-success=linters
- "check-success=Rule: Conventional Commit (post_check)"
- head=trivy/daily-report
- author=mergify-ci-bot
- label!=manual merge
- label!=new CVE
- "#commits=1"
batch_size: 7
batch_max_wait_time: 5min
queue_branch_merge_method: fast-forward
disallow_checks_interruption_from_queues:
- default

commit_message_template:
- name: duplicated lowprio from automatic merge from dependabot
allow_inplace_checks: true
conditions:
- and:
- check-success=linters
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
- and: *CheckRuns
- "check-success=Rule: Conventional Commit (post_check)"
- author=dependabot[bot]
- label!=manual merge
- "#commits=1"
batch_size: 7
batch_max_wait_time: 5min
queue_branch_merge_method: fast-forward
disallow_checks_interruption_from_queues:
- default

commit_message_template:
- name: lowprio
allow_inplace_checks: true
conditions:
Expand Down Expand Up @@ -54,15 +93,15 @@ pull_request_rules:
conditions:
- base=main
- "check-success=Rule: Conventional Commit (post_check)"
- and: *CheckRuns
- and: &CheckRuns
- check-success=linters
- "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
- "#review-threads-unresolved=0"
- "#review-requested=0"
- label!=manual merge
actions:
queue:

- name: automatic merge for clifus version bump
conditions:
- and: *CheckRuns
Expand All @@ -77,34 +116,6 @@ pull_request_rules:
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

0 comments on commit 5d8ceb2

Please sign in to comment.