From 9000cf59dd84bf42ff3c3a6ead2aa4d9ca6ac29e Mon Sep 17 00:00:00 2001
From: curquiza <clementine@meilisearch.com>
Date: Mon, 1 Dec 2025 18:16:13 +0100
Subject: [PATCH] Remove bors and use GitHub merge queue

---
 .github/release-draft-template.yml | 2 --
 .github/workflows/tests.yml        | 4 +---
 CONTRIBUTING.md                    | 6 ------
 README.md                          | 1 -
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml
index 7f356b43..bf3ccf88 100644
--- a/.github/release-draft-template.yml
+++ b/.github/release-draft-template.yml
@@ -28,7 +28,5 @@ template: |
 no-changes-template: 'Changes are coming soon 😎'
 sort-direction: 'ascending'
 replacers:
-  - search: '/(?:and )?@bors(?:\[bot\])?,?/g'
-    replace: ''
   - search: '/(?:and )?@meili-bot,?/g'
     replace: ''
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c5d8d2a1..8b22cd02 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,11 +3,9 @@ name: Tests
 on:
   pull_request:
   push:
-    # trying and staging branches are for BORS config
     branches:
-      - trying
-      - staging
       - main
+  merge_group:
 
 jobs:
   integration_tests:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b4125134..02eafb87 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -109,7 +109,6 @@ Some notes on GitHub PRs:
 
 - [Convert your PR as a draft](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) if your changes are a work in progress: no one will review it until you pass your PR as ready for review.<br>
   The draft PR can be very useful if you want to show that you are working on something and make your work visible.
-- The branch related to the PR must be **up-to-date with `main`** before merging. Fortunately, this project [integrates a bot](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md) to automatically enforce this requirement without the PR author having to do it manually.
 - All PRs must be reviewed and approved by at least one maintainer.
 - The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changelogs](https://github.com/meilisearch/strapi-plugin-meilisearch/releases/).
 
@@ -117,11 +116,6 @@ Some notes on GitHub PRs:
 
 Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org/).
 
-### Automation to Rebase and Merge the PRs <!-- omit in toc -->
-
-This project integrates a bot that helps us manage pull requests merging.<br>
-_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
-
 ### Automated Changelogs
 
 This project integrates a tool to create automated changelogs.<br>
diff --git a/README.md b/README.md
index 3c7958af..1bcd2988 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@
   <a href="https://github.com/meilisearch/strapi-plugin-meilisearch/actions"><img src="https://github.com/meilisearch/strapi-plugin-meilisearch/workflows/Tests/badge.svg" alt="Tests"></a>
   <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/styled_with-prettier-ff69b4.svg" alt="Prettier"></a>
   <a href="https://github.com/meilisearch/strapi-plugin-meilisearch/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
-  <a href="https://ms-bors.herokuapp.com/repositories/7"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
 </p>
 
 <p align="center">⚡ The Meilisearch plugin for Strapi</p>