Skip to content

Commit 821d5ed

Browse files
committed
Remove bors and use GitHub merge queue
1 parent 085a090 commit 821d5ed

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

.github/release-draft-template.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,5 @@ template: |
3131
no-changes-template: 'Changes are coming soon 😎'
3232
sort-direction: 'ascending'
3333
replacers:
34-
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
35-
replace: ''
3634
- search: '/(?:and )?@meili-bot,?/g'
3735
replace: ''

.github/workflows/tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ name: Tests
22

33
on:
44
pull_request:
5+
merge_group:
56
push:
6-
# trying and staging branches are for BORS config
77
branches:
8-
- trying
9-
- staging
108
- main
119

1210
jobs:

CONTRIBUTING.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,13 @@ Some notes on GitHub PRs:
116116

117117
- [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>
118118
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
119-
- 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.
120119
- All PRs must be reviewed and approved by at least one maintainer.
121120
- 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/docs-searchbar.js/releases/).
122121

123122
## Release Process (for the internal team only)
124123

125124
Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org/).
126125

127-
### Automation to Rebase and Merge the PRs <!-- omit in TOC -->
128-
129-
This project integrates a bot that helps us manage pull requests merging.<br>
130-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
131-
132126
### Automated Changelogs <!-- omit in TOC -->
133127

134128
This project integrates a tool to create automated changelogs.<br>

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Seeking immediate support? Please join us on [our Discord channel](https://disco
3535
<a href="https://www.npmjs.com/package/docs-searchbar.js"><img src="https://img.shields.io/npm/v/docs-searchbar.js.svg" alt="NPM version"></a>
3636
<a href="https://github.com/meilisearch/docs-searchbar.js/actions"><img src="https://github.com/meilisearch/docs-searchbar.js/workflows/Tests/badge.svg" alt="Test"></a>
3737
<a href="https://github.com/meilisearch/docs-searchbar.js/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
38-
<a href="https://ms-bors.herokuapp.com/repositories/11"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
3938
</p>
4039

4140
**docs-searchbar.js** is a front-end SDK for **Meilisearch** providing a search bar for your documentation.

0 commit comments

Comments
 (0)