Skip to content

Commit

Permalink
ci: update mergify config to replace,remove deprecated attributes
Browse files Browse the repository at this point in the history
update mergify config to remove, replace the deprecated attributes.

Signed-off-by: Nikhil-Ladha <nikhilladha1999@gmail.com>
  • Loading branch information
Nikhil-Ladha committed Aug 21, 2024
1 parent cc6835e commit 77f5cd1
Showing 1 changed file with 5 additions and 29 deletions.
34 changes: 5 additions & 29 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
---
defaults:
actions:
queue:
# merge_bot_account: ceph-csi-bot #mergify[bot] will be merging prs.
# update_bot_account: ceph-csi-bot #mergify will randomly pick and use
# credentials of users with write access to repo to rebase prs.
name: default
method: rebase
update_method: rebase
# For rebasing Mergify uses the author of the PR. Ideally we use the
# ceph-csi-bot for that, but this is a feature that needs a paid
# subscription.
#
# rebase:
# Use ceph-csi-bot for rebasing, not the account of the PR owner.
# bot_account: ceph-csi-bot

# by default Mergify requires manual merging of PRs that modify its own
# configuration (this file), allowing this makes it easier to prepare for
# releases (new branches added here)
allow_merging_configuration_change: true

queue_rules:
- name: default
conditions:
merge_conditions:
# Conditions to get out of the queue (= merged)
- or:
- and:
Expand Down Expand Up @@ -92,6 +70,8 @@ queue_rules:
- base=ci/centos
- "status-success=ci/centos/job-validation"
- "status-success=ci/centos/jjb-validate"
merge_method: rebase
update_method: rebase

pull_request_rules:
- name: start CI jobs for PRs in the merge queue
Expand Down Expand Up @@ -125,9 +105,7 @@ pull_request_rules:
actions:
comment:
# yamllint disable-line rule:truthy
message: "This pull request now has conflicts with the target branch.
Could you please resolve conflicts and force push the corrected
changes? 🙏"
message: "This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏"

- name: update dependencies by dependabot (skip commitlint)
conditions:
Expand Down Expand Up @@ -480,6 +458,4 @@ pull_request_rules:
draft: true
comment:
# yamllint disable-line rule:truthy
message: "The PR description contains the unsupported `[skip ci]`
command, please update the description and mark the PR ready for review
again."
message: "The PR description contains the unsupported `[skip ci]` command, please update the description and mark the PR ready for review again."

0 comments on commit 77f5cd1

Please sign in to comment.