Skip to content

Commit d8d5d92

Browse files
committed
Remove bors and use GitHub merge queue
1 parent 1ae39ac commit d8d5d92

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

.github/release-draft-template.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,5 @@ template: |
2828
no-changes-template: 'Changes are coming soon 😎'
2929
sort-direction: 'ascending'
3030
replacers:
31-
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
32-
replace: ''
3331
- search: '/(?:and )?@meili-bot,?/g'
3432
replace: ''
35-
- search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g'
36-
replace: ''

.github/workflows/tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ name: Tests
33
on:
44
pull_request:
55
push:
6-
# trying and staging branches are for BORS config
76
branches:
8-
- trying
9-
- staging
107
- main
8+
merge_group:
119

1210
jobs:
1311
tests:

CONTRIBUTING.md

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

9292
- [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>
9393
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
94-
- 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.
9594
- All PRs must be reviewed and approved by at least one maintainer.
9695
- 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-java/releases/).
9796

9897
## Release Process (for the internal team only)
9998

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

102-
### Automation to Rebase and Merge the PRs <!-- omit in TOC -->
103-
104-
This project integrates a bot that helps us manage pull requests merging.<br>
105-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
106-
107101
### Automated Changelogs <!-- omit in TOC -->
108102

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

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<a href="https://maven-badges.herokuapp.com/maven-central/com.meilisearch.sdk/meilisearch-java"><img src="https://maven-badges.herokuapp.com/maven-central/com.meilisearch.sdk/meilisearch-java/badge.svg" alt="Version"></a>
1919
<a href="https://github.com/meilisearch/meilisearch-java/actions"><img src="https://github.com/meilisearch/meilisearch-java/workflows/Tests/badge.svg" alt="Tests"></a>
2020
<a href="https://github.com/meilisearch/meilisearch-java/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
21-
<a href="https://ms-bors.herokuapp.com/repositories/60"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
2221
<a href="https://codecov.io/gh/meilisearch/meilisearch-java"><img src="https://codecov.io/gh/meilisearch/meilisearch-java/branch/main/graph/badge.svg" alt="Code Coverage"></a>
2322
</p>
2423

@@ -238,7 +237,7 @@ SearchResultPaginated results = (SearchResultPaginated) index.search(
238237
"title": "Wonder Woman",
239238
"genres": ["Action","Adventure"]
240239
}
241-
],
240+
],
242241
"query": "wonder",
243242
"processingTimeMs": 0,
244243
"hitsPerPage": 20,

0 commit comments

Comments
 (0)