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

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

Closed
wants to merge 1 commit into from
Closed
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
37 changes: 26 additions & 11 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
#
# 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 "---"
# Add "common_merge_criteria" anchor
# Use "*common_merge_criteria" alias to reference this anchor
my_ci: &common_merge_criteria
Expand All @@ -11,6 +10,7 @@
#
# 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 @@
# 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 @@
# 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 @@
# 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 @@
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 @@
- 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 @@
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
Loading