diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index feb95d8ad..a13d51086 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -6,11 +6,7 @@ on:
# Everyday at 5:00am
- cron: "0 5 * * *"
pull_request:
- push:
- # trying and staging branches are for Bors config
- branches:
- - trying
- - staging
+ merge_group:
env:
CARGO_TERM_COLOR: always
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 26d5b74b4..e129e5600 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -150,7 +150,7 @@ Some notes on GitHub PRs:
- The PR title should be accurate and descriptive of the changes.
- [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.
The draft PRs are recommended when 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 uses [Bors](https://github.com/bors-ng/bors-ng) to automatically enforce this requirement without the PR author having to rebase manually.
+- The branch related to the PR must be **up-to-date with `main`** before merging. Fortunately, this project uses [GitHub Merge Queues](https://github.blog/news-insights/product-news/github-merge-queue-is-generally-available/) to automatically enforce this requirement without the PR author having to rebase manually.
## Release Process (for internal team only)
@@ -158,8 +158,7 @@ Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org
### Automation to rebase and Merge the PRs
-This project integrates a bot that helps us manage pull requests merging.
-_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
+This project uses GitHub Merge Queues that helps us manage pull requests merging.
### How to Publish a new Release
diff --git a/README.md b/README.md
index 42062781a..508efb14b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
⚡ A lightning-fast search engine that fits effortlessly into your apps, websites, and workflow 🔍
diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 3d04b834c..000000000 --- a/bors.toml +++ /dev/null @@ -1,10 +0,0 @@ -status = [ - 'Tests on ubuntu-22.04', - 'Tests on macos-13', - 'Tests on windows-2022', - 'Run Clippy', - 'Run Rustfmt', - 'Run tests in debug', -] -# 3 hours timeout -timeout-sec = 10800