Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mergify rules #182

Merged
merged 1 commit into from
Nov 17, 2022
Merged
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
29 changes: 21 additions & 8 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,35 @@
# The `check-success` should be specifying the final job in the CI workflow assuming it depends
# directly or indirectly on all other jobs passing.

shared:
# Rules applicable to both queueing and merge requests.
compulsory: &compulsory

# Ensure the minimal CI checks have passed.
- check-success=DCO
- check-success=Package

# Ensure we're targetting the default branch.
- base=main

# Ensure we have adequete reviews.
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"

queue_rules:
- name: default
conditions:
- check-success=DCO
- check-success=package
- and: *compulsory

pull_request_rules:
- name: Automatic merge on approval
- name: Automatic merge
conditions:
- base=main
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=DCO
- check-success=package
- and: *compulsory

# Ensure the review is opted in using labels.
- label!=do-not-merge
- label=ready-to-merge

actions:
queue:
method: merge
Expand Down