mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
ci: update mergify config to replace,remove deprecated attributes
update mergify config to remove, replace the deprecated attributes. Signed-off-by: Nikhil-Ladha <nikhilladha1999@gmail.com>
This commit is contained in:
parent
38fd27a209
commit
4da71363b5
38
.mergify.yml
38
.mergify.yml
@ -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:
|
queue_rules:
|
||||||
- name: default
|
- name: default
|
||||||
conditions:
|
merge_conditions:
|
||||||
# Conditions to get out of the queue (= merged)
|
# Conditions to get out of the queue (= merged)
|
||||||
- or:
|
- or:
|
||||||
- and:
|
- and:
|
||||||
@ -92,6 +70,8 @@ queue_rules:
|
|||||||
- base=ci/centos
|
- base=ci/centos
|
||||||
- "status-success=ci/centos/job-validation"
|
- "status-success=ci/centos/job-validation"
|
||||||
- "status-success=ci/centos/jjb-validate"
|
- "status-success=ci/centos/jjb-validate"
|
||||||
|
merge_method: rebase
|
||||||
|
update_method: rebase
|
||||||
|
|
||||||
pull_request_rules:
|
pull_request_rules:
|
||||||
- name: start CI jobs for PRs in the merge queue
|
- name: start CI jobs for PRs in the merge queue
|
||||||
@ -124,10 +104,8 @@ pull_request_rules:
|
|||||||
- author!=dependabot[bot]
|
- author!=dependabot[bot]
|
||||||
actions:
|
actions:
|
||||||
comment:
|
comment:
|
||||||
# yamllint disable-line rule:truthy
|
# yamllint disable-line rule:truthy rule:line-length
|
||||||
message: "This pull request now has conflicts with the target branch.
|
message: "This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏"
|
||||||
Could you please resolve conflicts and force push the corrected
|
|
||||||
changes? 🙏"
|
|
||||||
|
|
||||||
- name: update dependencies by dependabot (skip commitlint)
|
- name: update dependencies by dependabot (skip commitlint)
|
||||||
conditions:
|
conditions:
|
||||||
@ -479,7 +457,5 @@ pull_request_rules:
|
|||||||
edit:
|
edit:
|
||||||
draft: true
|
draft: true
|
||||||
comment:
|
comment:
|
||||||
# yamllint disable-line rule:truthy
|
# yamllint disable-line rule:truthy rule:line-length
|
||||||
message: "The PR description contains the unsupported `[skip ci]`
|
message: "The PR description contains the unsupported `[skip ci]` command, please update the description and mark the PR ready for review again."
|
||||||
command, please update the description and mark the PR ready for review
|
|
||||||
again."
|
|
||||||
|
Loading…
Reference in New Issue
Block a user