mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: prevent Mergify from doing merge commits

Browse Source 
Merge commits cause the CentOS CI commitlint job to fail. By configuring
Mergify to not do merge commits, but rebases before final testing, we
can use the CentOS CI commitlint job when the GitHub commitlint App does
not work.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-08-12 09:41:10 +02:00 committed by Madhu Rajanna
parent 75d800c07e
commit b881ef1eee
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.mergify.yml
View File

@ -35,8 +35,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: automatic merge PR having ready-to-merge label - name: automatic merge PR having ready-to-merge label
@ -58,8 +59,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release v1.2.0 branch - name: backport patches to release v1.2.0 branch
@ -83,8 +85,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v2.0 branch - name: backport patches to release-v2.0 branch
@ -108,8 +111,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v2.1 branch - name: backport patches to release-v2.1 branch
@ -133,8 +137,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v3.0 branch - name: backport patches to release-v3.0 branch
@ -158,8 +163,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v3.1 branch - name: backport patches to release-v3.1 branch
@ -191,6 +197,7 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
bot_account: ceph-csi-bot
strict: smart strict: smart
strict_method: rebase strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
@ -216,8 +223,9 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: automatic merge PR having ready-to-merge label on ci/centos - name: automatic merge PR having ready-to-merge label on ci/centos
@ -235,7 +243,8 @@ pull_request_rules:
merge: merge:
method: rebase method: rebase
rebase_fallback: merge rebase_fallback: merge
strict: smart
bot_account: ceph-csi-bot bot_account: ceph-csi-bot
strict: smart
strict_method: rebase
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}