Skip to content

Commit

Permalink
Merge pull request #340 from jd/fix-mergify
Browse files Browse the repository at this point in the history
ci: fix Mergify config
  • Loading branch information
jd authored Jan 26, 2022
2 parents 005ef22 + dfcf348 commit ff48431
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
queue_rules:
- name: default
conditions:
- "status-success=ci/circleci: pep8"
- "status-success=ci/circleci: black"
- "status-success=ci/circleci: py36"
- "status-success=ci/circleci: py37"
- "status-success=ci/circleci: py38"
- "status-success=ci/circleci: py39"

pull_request_rules:
- name: warn on no changelog
conditions:
Expand All @@ -21,8 +31,8 @@ pull_request_rules:
- "#approved-reviews-by>=1"
- label=no-changelog
actions:
merge:
strict: "smart"
queue:
name: default
method: squash
- name: automatic merge with changelog
conditions:
Expand All @@ -35,8 +45,8 @@ pull_request_rules:
- "#approved-reviews-by>=1"
- files~=^releasenotes/notes/
actions:
merge:
strict: "smart"
queue:
name: default
method: squash
- name: automatic merge for jd without changelog
conditions:
Expand All @@ -49,8 +59,8 @@ pull_request_rules:
- "status-success=ci/circleci: py39"
- label=no-changelog
actions:
merge:
strict: "smart"
queue:
name: default
method: squash
- name: automatic merge for jd with changelog
conditions:
Expand All @@ -63,8 +73,8 @@ pull_request_rules:
- "status-success=ci/circleci: py39"
- files~=^releasenotes/notes/
actions:
merge:
strict: "smart"
queue:
name: default
method: squash
- name: dismiss reviews
conditions: []
Expand Down

0 comments on commit ff48431

Please sign in to comment.