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 Nov 25, 2024
1 parent 630bdd8 commit 8023a74
Showing 1 changed file with 26 additions and 11 deletions.
37 changes: 26 additions & 11 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
#
# Shared keys
shared:

Check warning on line 3 in .github/mergify.yml

View workflow job for this annotation

GitHub Actions / Lint Green

3:1 [document-start] missing document start "---"

Check warning on line 3 in .github/mergify.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

3:1 [document-start] missing document start "---"
Expand All @@ -11,6 +10,7 @@ shared:
#
# Pull request rules https://docs.mergify.com/configuration/#pull-request-rules
# N.B. Evaluated in order defined

pull_request_rules: # yamllint disable-line rule:key-ordering
#
# PR.1) Remove stale approvals or changes requests
Expand All @@ -27,7 +27,8 @@ pull_request_rules: # yamllint disable-line rule:key-ordering
# PR.2) Require all conversations to be resolved
- actions:
comment:
message: "This Pull Request needs all conversation threads to be resolved. Could you fix it @{{author}}? 🙏"
message: "This Pull Request needs all conversation threads to be resolved.
Could you fix it @{{author}}? 🙏"
label:
add:
- question
Expand All @@ -48,7 +49,8 @@ pull_request_rules: # yamllint disable-line rule:key-ordering
# PR.4) Require all changes requested reviews to be resolved
- actions:
comment:
message: "This Pull Request needs all changes requested to be resolved. Could you fix it @{{author}}? 🙏"
message: "This Pull Request needs all changes requested to be resolved. Could
you fix it @{{author}}? 🙏"
label:
add:
- changes requested
Expand All @@ -68,7 +70,8 @@ pull_request_rules: # yamllint disable-line rule:key-ordering
# PR.6) If Pull Request check fails, request resolution (prevent stalling the merge queue)
- actions:
comment:
message: "This Pull Request needs all checks to run successfully. Could you fix it @{{author}}? 🙏"
message: "This Pull Request needs all checks to run successfully. Could you
fix it @{{author}}? 🙏"
label:
add:
- invalid
Expand All @@ -93,9 +96,6 @@ pull_request_rules: # yamllint disable-line rule:key-ordering
remove:
- invalid
queue:
commit_message_template: "{{ commits[0] }}"
method: squash
name: default
conditions:
- base=main
- label!=work in progress
Expand All @@ -107,13 +107,15 @@ pull_request_rules: # yamllint disable-line rule:key-ordering
- check-success="CI (Summary Code Coverage)"
- check-success="Lint Blue"
# - check-success="Lint Green"
- and: *common_merge_criteria
- &id001
and: *common_merge_criteria
name: Automatic merge on approval for Pull Requests
#
# PR.8) Detect when Pull Request has conflicts and add conflicts label
- actions:
comment:
message: "This Pull Request is now in conflict. Could you fix it @{{author}}? 🙏"
message: "This Pull Request is now in conflict. Could you fix it @{{author}}?
🙏"
label:
add:
- conflict
Expand Down Expand Up @@ -263,7 +265,20 @@ pull_request_rules: # yamllint disable-line rule:key-ordering
queue_rules: # yamllint disable-line rule:key-ordering
#
# Q.1) Add this Pull Request to the merge queue
- conditions:
- name: default
queue_conditions:
- base=main
- label!=work in progress
- label!=do not merge
- check-success="CI"
- check-success="CI (Ansible devel sanity Lint)"
- check-success="CI (Ansible devel sanity Sanity)"
- check-success="CI (Ansible devel sanity Units)"
- check-success="CI (Summary Code Coverage)"
- check-success="Lint Blue"
- *id001
merge_conditions:
- base=main
- and: *common_merge_criteria
name: default
commit_message_template: "{{ commits[0] }}"
merge_method: squash

0 comments on commit 8023a74

Please sign in to comment.