Skip to content

Commit e7b2533

Browse files
authored
Remove BORS, enable merge queues in actions (#1896)
1 parent 82b7f94 commit e7b2533

File tree

5 files changed

+4
-18
lines changed

5 files changed

+4
-18
lines changed

.github/release-draft-template.yml

-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,5 @@ replacers:
3131
replace: ''
3232
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
3333
replace: ''
34-
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
35-
replace: ''
3634
- search: '/(?:and )?@meili-bot,?/g'
3735
replace: ''

.github/workflows/tests.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ env:
55

66
on:
77
pull_request:
8+
merge_group:
89
push:
9-
# trying and staging branches are for BORS config
1010
branches:
11-
- trying
12-
- staging
1311
- main
1412

1513
jobs:

CONTRIBUTING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Some notes on GitHub PRs:
9494

9595
- [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>
9696
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
97-
- 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.
97+
- 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.
9898
- All PRs must be reviewed and approved by at least one maintainer.
9999
- 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-js/releases/).
100100

@@ -104,8 +104,7 @@ Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org
104104

105105
### Automation to Rebase and Merge the PRs
106106

107-
This project integrates a bot that helps us manage pull requests merging.<br>
108-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
107+
This project uses GitHub Merge Queues that helps us manage pull requests merging.
109108

110109
### Automated Changelogs
111110

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<a href="https://codecov.io/gh/meilisearch/meilisearch-js"><img src="https://codecov.io/github/meilisearch/meilisearch-js/coverage.svg?branch=main" alt="Codecov"></a>
2121
<a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/styled_with-prettier-ff69b4.svg" alt="Prettier"></a>
2222
<a href="https://github.com/meilisearch/meilisearch-js/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
23-
<a href="https://ms-bors.herokuapp.com/repositories/10"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
23+
<a href="https://github.com/meilisearch/meilisearch-js/queue"><img alt="Merge Queues enabled" src="https://img.shields.io/badge/Merge_Queues-enabled-%2357cf60?logo=github"></a>
2424
</p>
2525

2626
<p align="center">⚡ The Meilisearch API client written for JavaScript</p>

bors.toml

-9
This file was deleted.

0 commit comments

Comments
 (0)