From 17b0a9486434c768af68c5d2ed68105dd9fd8d77 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 27 Apr 2022 06:06:49 +0000
Subject: [PATCH] chore(ci): Mergify - merge Autobumps on release-* (#2034)
 (#2037)

And request review for failed autobump builds on master and release branches.

Lastly, remove Travis CI related rule. It's not used.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 04f77fbd91badbd86741654e5067cd95e097030a)

Co-authored-by: kskewes-sf <96093759+kskewes-sf@users.noreply.github.com>
---
 .mergify.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 9acb7204b7..86715459d9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -23,20 +23,6 @@ pull_request_rules:
         strict: smart
       label:
         add: ["auto merged"]
-  # This rule exists to handle release branches that are still building using Travis CI instead of
-  # using Github actions. It can be deleted once all active release branches are running Github actions.
-  - name: Automatically merge release branch changes on Travis CI success and release manager review
-    conditions:
-      - base~=^release-
-      - status-success=continuous-integration/travis-ci/pr
-      - "label=ready to merge"
-      - "approved-reviews-by=@release-managers"
-    actions:
-      merge:
-        method: squash
-        strict: smart
-      label:
-        add: ["auto merged"]
   - name: Automatically merge PRs from maintainers on CI success and review
     conditions:
       - base=master
@@ -51,7 +37,7 @@ pull_request_rules:
         add: ["auto merged"]
   - name: Automatically merge autobump PRs on CI success
     conditions:
-      - base=master
+      - base~=^(master|release-)
       - status-success=build
       - "label~=autobump-*"
       - "author:spinnakerbot"
@@ -63,7 +49,7 @@ pull_request_rules:
         add: ["auto merged"]
   - name: Request reviews for autobump PRs on CI failure
     conditions:
-      - base=master
+      - base~=^(master|release-)
       - status-failure=build
       - "label~=autobump-*"
       - base=master