diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml index 6fff7aa..54bcb8c 100644 --- a/.github/release-draft-template.yml +++ b/.github/release-draft-template.yml @@ -28,7 +28,5 @@ template: | no-changes-template: 'Changes will arrive 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 0e4dd91..62f23a5 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/.npmignore b/.npmignore index 582c3e9..02b1841 100644 --- a/.npmignore +++ b/.npmignore @@ -9,5 +9,4 @@ jest.config.js assets/docs-searchbar-demo.gif playground babel.config.js -bors.toml CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dd24529..bf3d98b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -86,7 +86,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/vuepress-plugin-meilisearch/releases/). @@ -94,11 +93,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 2cec346..a3bd249 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ Seeking immediate support? Please join us on our [Discord channel](https://disco npm version GitHub Workflow Status License - Bors enabled

âš¡ The Meilisearch plugin for VuePress

diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 56a2764..0000000 --- a/bors.toml +++ /dev/null @@ -1,7 +0,0 @@ -status = [ - 'linter-check', - 'Tests (Node.js 14)', - 'Tests (Node.js 16)' -] -# 1 hour timeout -timeout-sec = 3600