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.

Sign up for GitHub

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

ci(mergify): upgrade configuration to current format #2746

Closed
wants to merge 1 commit into from
Closed

ci(mergify): upgrade configuration to current format #2746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 19 additions & 17 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
#
# Shared keys
shared:
Expand All @@ -11,12 +10,18 @@ queue_rules:
#
# Add this PR to the merge queue
- name: edge-api
conditions:
queue_conditions:
- author~=^dependabot(|-preview)\[bot\]$
- and: *common-merge-criteria
- check-success=Lint
merge_conditions:
- base=main
- and: *common-merge-criteria
#
# Pull request rules https://docs.mergify.com/configuration/#pull-request-rules
# N.B. Evaluated in order defined
merge_method: merge

pull_request_rules:
#
# Remove stale approvals or changes request
Expand All @@ -31,17 +36,6 @@ pull_request_rules:
when: synchronize
#
# Dependabot PR merge rule
- name: Automatic merge for Dependabot pull requests
conditions:
- author~=^dependabot(|-preview)\[bot\]$
- and: *common-merge-criteria
- check-success=Lint
actions:
queue:
name: edge-api
method: merge
#
# If PR check fails, request resolution (prevent stalling the merge queue)
- name: Request PR check re-run
conditions:
- and:
Expand All @@ -55,7 +49,8 @@ pull_request_rules:
- -check-success=Lint
actions:
comment:
message: "This pull request needs all pr-checks to run successfully. Could you fix it @{{author}}? 🙏"
message: "This pull request needs all pr-checks to run successfully. Could
you fix it @{{author}}? 🙏"
label:
add:
- invalid
Expand All @@ -67,7 +62,8 @@ pull_request_rules:
- conflict
actions:
comment:
message: "This pull request is now in conflicts. Could you fix it @{{author}}? 🙏"
message: "This pull request is now in conflicts. Could you fix it @{{author}}?
🙏"
label:
add:
- conflict
Expand Down Expand Up @@ -189,12 +185,18 @@ pull_request_rules:
# Detect when PR is ready and add label
- name: add ready label
conditions:
- body~=(?m)^- \[[xX]\] I have commented my code, particularly in hard-to-understand areas
- body~=(?m)^- \[[xX]\] I have commented my code, particularly in hard-to-understand
areas
- body~=(?m)^- \[[xX]\] I have made corresponding changes to the documentation
- body~=(?m)^- \[[xX]\] I have added tests that prove my fix is effective or that my feature works
- body~=(?m)^- \[[xX]\] I have added tests that prove my fix is effective or
that my feature works
- body~=(?m)^- \[[xX]\] New and existing unit tests pass locally with my changes
- body~=(?m)^- \[[xX]\] I run `make pre-commit` to check fmt\/vet\/lint\/test-no-fdo
actions:
label:
add:
- ready
- name: refactored queue action rule
conditions: []
actions:
queue:
Loading