From 6066407a89a08360621539ae91204981a59e0783 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 8 Dec 2021 12:53:00 +0000
Subject: [PATCH] [skip ci] ci: switch to using automerge

Instead of using merify which seems to not do what we want, use
a combination of mergify and automerge. We let mergify review
dependabot PRs. We let mergify dismiss reviews on updates but
exclude those from Schutzbot. We then let Schutzbot update and
merge the PRs via automerge if the `ci:automerge` label is set.
---
 .github/mergify.yml             | 66 +++------------------------------
 .github/workflows/automerge.yml | 31 ++++++++++++++++
 2 files changed, 36 insertions(+), 61 deletions(-)
 create mode 100644 .github/workflows/automerge.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 12b5ddb9..152ee052 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,24 +1,3 @@
-queue_rules:
-  - name: default
-    conditions:
-      - base=main
-      - check-success=📚 Documentation
-      - check-success=Schutzbot on GitLab
-      - check-success=Test Suite (test.mod)
-      - check-success=Test Suite (test.run.test_assemblers)
-      - check-success=Test Suite (test.run.test_boot)
-      - check-success=Test Suite (test.run.test_noop)
-      - check-success=Test Suite (test.run.test_ostree)
-      - check-success=Test Suite (test.run.test_sources)
-      - check-success=Test Suite (test.run.test_stages)
-      - check-success=Test Suite (test.src)
-      - check-success=Regenerate Test Data
-      - check-success=Spell check
-      - or:
-        - "check-success=LGTM analysis: Python"
-        - "check-neutral=LGTM analysis: Python"
-      - check-success=codecov/project
-      - "check-success~=rpm-build:.*"
 
 pull_request_rules:
   - name: Automatic review for Dependabot pull requests
@@ -35,46 +14,11 @@ pull_request_rules:
         add:
           - ci:automerge
 
-  - name: Automatic merge on green via label
+  - name: Dismiss reviews for non trusted authors
     conditions:
       - base=main
-      - "#approved-reviews-by>=1"
-      - "#changes-requested-reviews-by=0"
-      - "check-success~=rpm-build:.*"
-      - "label=ci:automerge"
-      - base=main
-      - check-success=📚 Documentation
-      - check-success=Schutzbot on GitLab
-      - check-success=Test Suite (test.mod)
-      - check-success=Test Suite (test.run.test_assemblers)
-      - check-success=Test Suite (test.run.test_boot)
-      - check-success=Test Suite (test.run.test_noop)
-      - check-success=Test Suite (test.run.test_ostree)
-      - check-success=Test Suite (test.run.test_sources)
-      - check-success=Test Suite (test.run.test_stages)
-      - check-success=Test Suite (test.src)
-      - check-success=Regenerate Test Data
-      - check-success=Spell check
-      - or:
-        - "check-success=LGTM analysis: Python"
-        - "check-neutral=LGTM analysis: Python"
-      - check-success=codecov/project
-      - "check-success~=rpm-build:.*"
+      - author!=@Schutzbot
     actions:
-      queue:
-        name: default
-        method: rebase
-        update_method: rebase
-        rebase_fallback: none
-        require_branch_protection: false
-      review:
-        type: APPROVE
-        message: Automatic review via mergify
-  - name: Remove label after merge or close
-    conditions:
-      - merged
-      - closed
-    actions:
-      label:
-        remove:
-          - ci:automerge
+      dismiss_reviews:
+        approved: True
+        changes_requested: True
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 00000000..b6430140
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,31 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.14.3"
+        env:
+          GITHUB_TOKEN: "${{ secrets.SCHUTZBOT_GITHUB_ACCESS_TOKEN }}"
+          MERGE_LABELS: "ci:automerge"
+          MERGE_REMOVE_LABELS: "ci:automerge"
+          MERGE_METHOD: "rebase"
+          UPDATE_METHOD: "rebase"