Skip to content

Commit

Permalink
Merge pull request #2327 from tskit-dev/mergify/configuration-depreca…
Browse files Browse the repository at this point in the history
…ted-update

ci(mergify): upgrade configuration to current format
  • Loading branch information
benjeffery authored Nov 20, 2024
2 parents feed38d + 17d96dc commit 1fc1995
Showing 1 changed file with 12 additions and 16 deletions.
28 changes: 12 additions & 16 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
queue_rules:
- name: default
conditions:
queue_conditions:
- "-merged"
- "#approved-reviews-by>=1"
- base=main
- label=AUTOMERGE-REQUESTED
- status-success=Docs
- status-success=Lint
- status-success=Python (3.9, macos-latest)
Expand All @@ -11,13 +14,8 @@ queue_rules:
- status-success=Python (3.9, windows-latest)
- status-success=Python (3.12, windows-latest)
- "status-success=ci/circleci: build"
pull_request_rules:
- name: Automatic rebase, CI and merge
conditions:
- "-merged"
merge_conditions:
- "#approved-reviews-by>=1"
- base=main
- label=AUTOMERGE-REQUESTED
- status-success=Docs
- status-success=Lint
- status-success=Python (3.9, macos-latest)
Expand All @@ -27,16 +25,10 @@ pull_request_rules:
- status-success=Python (3.9, windows-latest)
- status-success=Python (3.12, windows-latest)
- "status-success=ci/circleci: build"
#- status-success=codecov/patch
#- status-success=codecov/project/c-tests
#- status-success=codecov/project/python-c-tests
#- status-success=codecov/project/python-tests
actions:
queue:
name: default
method: rebase
update_method: rebase
merge_method: rebase
update_method: rebase

pull_request_rules:
- name: Remove label after merge
conditions:
- merged
Expand All @@ -45,3 +37,7 @@ pull_request_rules:
label:
remove:
- AUTOMERGE-REQUESTED
- name: refactored queue action rule
conditions: []
actions:
queue:

0 comments on commit 1fc1995

Please sign in to comment.