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

ci: use "devel" branch instead of "master"

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit a7e95e756a)
This commit is contained in:
Niels de Vos 2021-02-25 09:20:22 +01:00 committed by Madhu Rajanna
parent 79b47751ba
commit 2131b49bdf
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.mergify.yml
View File

@ -2,7 +2,7 @@
pull_request_rules: pull_request_rules:
- name: remove outdated approvals - name: remove outdated approvals
conditions: conditions:
- base=master - base=devel
actions: actions:
dismiss_reviews: dismiss_reviews:
approved: true approved: true
@ -19,7 +19,7 @@ pull_request_rules:
- name: automatic merge - name: automatic merge
conditions: conditions:
- label!=DNM - label!=DNM
- base=master - base=devel
- "#approved-reviews-by>=2" - "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0" - "#changes-requested-reviews-by=0"
- "status-success=codespell" - "status-success=codespell"
@ -51,7 +51,7 @@ pull_request_rules:
conditions: conditions:
- label!=DNM - label!=DNM
- label=ready-to-merge - label=ready-to-merge
- base=master - base=devel
- "#approved-reviews-by>=1" - "#approved-reviews-by>=1"
- "status-success=codespell" - "status-success=codespell"
- "status-success=multi-arch-build" - "status-success=multi-arch-build"
@ -81,7 +81,7 @@ pull_request_rules:
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release v1.2.0 branch - name: backport patches to release v1.2.0 branch
conditions: conditions:
- base=master - base=devel
- label=backport-to-release-v1.2.0 - label=backport-to-release-v1.2.0
actions: actions:
backport: backport:
@ -107,7 +107,7 @@ pull_request_rules:
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v2.0 branch - name: backport patches to release-v2.0 branch
conditions: conditions:
- base=master - base=devel
- label=backport-to-release-v2.0 - label=backport-to-release-v2.0
actions: actions:
backport: backport:
@ -133,7 +133,7 @@ pull_request_rules:
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v2.1 branch - name: backport patches to release-v2.1 branch
conditions: conditions:
- base=master - base=devel
- label=backport-to-release-v2.1 - label=backport-to-release-v2.1
actions: actions:
backport: backport:
@ -159,7 +159,7 @@ pull_request_rules:
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v3.0 branch - name: backport patches to release-v3.0 branch
conditions: conditions:
- base=master - base=devel
- label=backport-to-release-v3.0 - label=backport-to-release-v3.0
actions: actions:
backport: backport:
@ -185,7 +185,7 @@ pull_request_rules:
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v3.1 branch - name: backport patches to release-v3.1 branch
conditions: conditions:
- base=master - base=devel
- label=backport-to-release-v3.1 - label=backport-to-release-v3.1
actions: actions:
backport: backport:
@ -220,7 +220,7 @@ pull_request_rules:
delete_head_branch: {} delete_head_branch: {}
- name: backport patches to release-v3.2 branch - name: backport patches to release-v3.2 branch
conditions: conditions:
- base=master - base=devel
- label=backport-to-release-v3.2 - label=backport-to-release-v3.2
actions: actions:
backport: backport:

2
Makefile
View File

@ -68,7 +68,7 @@ endif
# Pass GIT_SINCE for the range of commits to test. Used with the commitlint # Pass GIT_SINCE for the range of commits to test. Used with the commitlint
# target. # target.
GIT_SINCE := origin/master GIT_SINCE := origin/devel
SELINUX := $(shell getenforce 2>/dev/null) SELINUX := $(shell getenforce 2>/dev/null)
ifeq ($(SELINUX),Enforcing) ifeq ($(SELINUX),Enforcing)