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

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

diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml
index c70e6137..e9865700 100644
--- a/.github/release-draft-template.yml
+++ b/.github/release-draft-template.yml
@@ -28,9 +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: ''
-  - search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g'
-    replace: ''
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 223d1079..eddd0652 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:
   tests:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 73e27c48..ad476955 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,7 +91,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/meilisearch-java/releases/).
 
@@ -99,11 +98,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 <!-- omit in TOC -->
 
 This project integrates a tool to create automated changelogs.<br>
diff --git a/README.md b/README.md
index 993ec768..3d1d7dce 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,6 @@
   <a href="https://maven-badges.herokuapp.com/maven-central/com.meilisearch.sdk/meilisearch-java"><img src="https://maven-badges.herokuapp.com/maven-central/com.meilisearch.sdk/meilisearch-java/badge.svg" alt="Version"></a>
   <a href="https://github.com/meilisearch/meilisearch-java/actions"><img src="https://github.com/meilisearch/meilisearch-java/workflows/Tests/badge.svg" alt="Tests"></a>
   <a href="https://github.com/meilisearch/meilisearch-java/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
-  <a href="https://ms-bors.herokuapp.com/repositories/60"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
   <a href="https://codecov.io/gh/meilisearch/meilisearch-java"><img src="https://codecov.io/gh/meilisearch/meilisearch-java/branch/main/graph/badge.svg" alt="Code Coverage"></a>
 </p>
 
@@ -238,7 +237,7 @@ SearchResultPaginated results = (SearchResultPaginated) index.search(
             "title": "Wonder Woman",
             "genres": ["Action","Adventure"]
         }
-    ], 
+    ],
     "query": "wonder",
     "processingTimeMs": 0,
     "hitsPerPage": 20,