From 2131b49bdf851cf7a6f606ea6c1a939bf52b6a01 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Thu, 25 Feb 2021 09:20:22 +0100
Subject: [PATCH] ci: use "devel" branch instead of "master"

Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit a7e95e756a9497665c23a572ffa69e8ea48bfab5)
---
 .mergify.yml | 18 +++++++++---------
 Makefile     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 82d0180e7..e941e2a87 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,7 +2,7 @@
 pull_request_rules:
   - name: remove outdated approvals
     conditions:
-      - base=master
+      - base=devel
     actions:
       dismiss_reviews:
         approved: true
@@ -19,7 +19,7 @@ pull_request_rules:
   - name: automatic merge
     conditions:
       - label!=DNM
-      - base=master
+      - base=devel
       - "#approved-reviews-by>=2"
       - "#changes-requested-reviews-by=0"
       - "status-success=codespell"
@@ -51,7 +51,7 @@ pull_request_rules:
     conditions:
       - label!=DNM
       - label=ready-to-merge
-      - base=master
+      - base=devel
       - "#approved-reviews-by>=1"
       - "status-success=codespell"
       - "status-success=multi-arch-build"
@@ -81,7 +81,7 @@ pull_request_rules:
       delete_head_branch: {}
   - name: backport patches to release v1.2.0 branch
     conditions:
-      - base=master
+      - base=devel
       - label=backport-to-release-v1.2.0
     actions:
       backport:
@@ -107,7 +107,7 @@ pull_request_rules:
       delete_head_branch: {}
   - name: backport patches to release-v2.0 branch
     conditions:
-      - base=master
+      - base=devel
       - label=backport-to-release-v2.0
     actions:
       backport:
@@ -133,7 +133,7 @@ pull_request_rules:
       delete_head_branch: {}
   - name: backport patches to release-v2.1 branch
     conditions:
-      - base=master
+      - base=devel
       - label=backport-to-release-v2.1
     actions:
       backport:
@@ -159,7 +159,7 @@ pull_request_rules:
       delete_head_branch: {}
   - name: backport patches to release-v3.0 branch
     conditions:
-      - base=master
+      - base=devel
       - label=backport-to-release-v3.0
     actions:
       backport:
@@ -185,7 +185,7 @@ pull_request_rules:
       delete_head_branch: {}
   - name: backport patches to release-v3.1 branch
     conditions:
-      - base=master
+      - base=devel
       - label=backport-to-release-v3.1
     actions:
       backport:
@@ -220,7 +220,7 @@ pull_request_rules:
       delete_head_branch: {}
   - name: backport patches to release-v3.2 branch
     conditions:
-      - base=master
+      - base=devel
       - label=backport-to-release-v3.2
     actions:
       backport:
diff --git a/Makefile b/Makefile
index 3a3ef12d9..a4594b429 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ endif
 
 # Pass GIT_SINCE for the range of commits to test. Used with the commitlint
 # target.
-GIT_SINCE := origin/master
+GIT_SINCE := origin/devel
 
 SELINUX := $(shell getenforce 2>/dev/null)
 ifeq ($(SELINUX),Enforcing)