From 0fdbef8baf837c807aceced294e3123f0dbb15fc Mon Sep 17 00:00:00 2001
From: Takafumi Arakaki <aka.tkf@gmail.com>
Date: Wed, 9 Sep 2020 16:36:53 -0700
Subject: [PATCH] Use protected branch instead of manual listing in
 .mergify.yml

---
 .mergify.yml | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 2efe6cb..dae20a9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,3 +1,6 @@
+# [NOTE] This setting relies on "required status check":
+# https://docs.github.com/en/github/administering-a-repository/about-required-status-checks
+
 pull_request_rules:
   - name: remove outdated reviews
     conditions:
@@ -8,7 +11,15 @@ pull_request_rules:
     conditions:
       - base=master
       - "#approved-reviews-by>=1"
-      - status-success=Travis CI - Pull Request
+      - label=ready-to-merge:squash
+      - label!=work-in-progress
+    actions:
+      merge:
+        method: squash
+  - name: automatic squash-merge when CI passes (@tkf)
+    conditions:
+      - base=master
+      - author=tkf
       - label=ready-to-merge:squash
       - label!=work-in-progress
     actions:
@@ -18,7 +29,15 @@ pull_request_rules:
     conditions:
       - base=master
       - "#approved-reviews-by>=1"
-      - status-success=Travis CI - Pull Request
+      - label=ready-to-merge:rebase
+      - label!=work-in-progress
+    actions:
+      merge:
+        method: rebase
+  - name: automatic rebase-merge when CI passes (@tkf)
+    conditions:
+      - base=master
+      - author=tkf
       - label=ready-to-merge:rebase
       - label!=work-in-progress
     actions:
@@ -28,17 +47,17 @@ pull_request_rules:
     conditions:
       - base=master
       - "#approved-reviews-by>=1"
-      - status-success=Travis CI - Pull Request
       - label=ready-to-merge:merge
       - label!=work-in-progress
     actions:
       merge:
         method: merge
-  - name: automatically approve PR when pushed by me
+  - name: automatic merge when CI passes (@tkf)
     conditions:
-      - author=tkf
       - base=master
-      - status-success=Travis CI - Pull Request
-      - label~=ready-to-merge:.*
+      - author=tkf
+      - label=ready-to-merge:merge
+      - label!=work-in-progress
     actions:
-      review: {}
+      merge:
+        method: merge