From ee10aacc689c32e3f960f2c21ab915675a67f3e0 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leons@opentitan.org>
Date: Mon, 31 Jul 2023 11:13:31 -0400
Subject: [PATCH] Remove bors-ng and switch to GitHub actions merge-queue

This removes the bors configuration and switches to the GitHub actions
merge queue merge bot. It replicates the required status checks for
bors to pass, and adds the appropriate GitHub merge group status
checks. This PR needs to be followed up with the appropriate
configuration applied in the repository settings.
---
 .github/workflows/ci.yml        | 10 ++++------
 .github/workflows/mac-os.yml    |  5 +++--
 .github/workflows/size-diff.yml | 10 ++++------
 bors.toml                       |  4 ----
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 bors.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd42e093..fa0f48ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,14 +2,12 @@
 
 name: ci
 
-# We want to run CI on all pull requests. Additionally, Bors needs workflows to
-# run on the `staging` and `trying` branches.
+# We want to run CI on all pull requests. Additionally, GitHub actions merge
+# queue needs workflows to run on the `merge_queue` trigger to block merges on
+# them.
 on:
   pull_request:
-  push:
-    branches:
-      - staging
-      - trying
+  merge_group:
 
 jobs:
   ci:
diff --git a/.github/workflows/mac-os.yml b/.github/workflows/mac-os.yml
index 3116069a..f4e785cb 100644
--- a/.github/workflows/mac-os.yml
+++ b/.github/workflows/mac-os.yml
@@ -2,8 +2,9 @@
 
 name: ci-mac-os
 
-# We run this workflow during pull request review, but not for Bors merges. We
-# can change this if the workflow is reasonably quick and reliable.
+# We run this workflow during pull request review, but not as a required status
+# for GitHub actions merge-queue merges. We can change this if the workflow is
+# reasonably quick and reliable.
 on: pull_request
 
 jobs:
diff --git a/.github/workflows/size-diff.yml b/.github/workflows/size-diff.yml
index 6989b392..b453a90b 100644
--- a/.github/workflows/size-diff.yml
+++ b/.github/workflows/size-diff.yml
@@ -3,14 +3,12 @@
 
 name: size-diff
 
-# We want to run this on all pull requests. Additionally, Bors needs workflows
-# to run on the `staging` and `trying` branches to block merges on them.
+# We want to run this on all pull requests. Additionally, GitHub actions merge
+# queue needs workflows to run on the `merge_queue` trigger to block merges on
+# them.
 on:
   pull_request:
-  push:
-    branches:
-      - staging
-      - trying
+  merge_group:
 
 jobs:
   size-diff:
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 4b9b851b..00000000
--- a/bors.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-status = [
-  "ci",
-  "size-diff",
-]