diff --git a/.gitattributes b/.gitattributes
index 6fedd00..a532ff3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,7 +7,6 @@
/.gitattributes export-ignore
/.gitignore export-ignore
/.php-cs-fixer.dist.php export-ignore
-/bors.toml export-ignore
/docker-compose.yml export-ignore
/docker-entrypoint.sh export-ignore
/Dockerfile export-ignore
diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml
index d406fe7..3d986ac 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 7afa495..d782a9a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,13 +3,11 @@ name: Tests
on:
pull_request:
push:
- # trying and staging branches are for BORS config
branches:
- - trying
- - staging
- main
schedule:
- cron: '0 3 * * 1'
+ merge_group:
jobs:
integration-tests:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5951e5b..91b03bd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -124,7 +124,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.
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-symfony/releases/).
@@ -132,11 +131,6 @@ Some notes on GitHub PRs:
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)._
-
### Automated Changelogs
This project integrates a tool to create automated changelogs.
diff --git a/README.md b/README.md
index 1323a7d..093d88d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@
-
âš¡ The Meilisearch bundle for Symfony