From 5fb0c4bd3823548b346a932d81c0496f622f9e4e Mon Sep 17 00:00:00 2001 From: curquiza Date: Mon, 1 Dec 2025 17:24:55 +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 | 7 +++---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml index 0ec349d3..69ea5588 100644 --- a/.github/release-draft-template.yml +++ b/.github/release-draft-template.yml @@ -29,7 +29,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 7272696a..f182e14f 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: env: MEILISEARCH_URL: http://localhost:7700 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6045b1cd..00baef3b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -141,7 +141,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-dart/releases/). @@ -149,11 +148,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 62fb6f12..29f596ac 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Pub Version GitHub Workflow Status License - Bors enabled Code Coverage

@@ -200,10 +199,10 @@ The `MeiliDocumentContainer` class contains meilisearch-specific fields (e.g. We define the `mapToContainer()` extension to help you quickly opt-in to this class, example: ```dart -final res = await index - .search("hello world") +final res = await index + .search("hello world") .asSearchResult() //or .asPaginatedResult() if using page parameters - .mapToContainer(); + .mapToContainer(); ``` ## 🤖 Compatibility with Meilisearch