Skip to content

Commit b2b2ac7

Browse files
authored
Merge pull request #739 from meilisearch/remove-bors
Remove bors and use GitHub merge queue
2 parents 2449b6a + 7bfb2bb commit b2b2ac7

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

.github/release-draft-template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ template: |
2828
no-changes-template: 'Changes are coming soon 😎'
2929
sort-direction: 'ascending'
3030
replacers:
31-
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
31+
- search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
3232
replace: ''
33-
- search: '/(?:and )?@meili-bot(?:\[bot\])?,?/g'
33+
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
3434
replace: ''
35-
- search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g'
35+
- search: '/(?:and )?@meili-bot(?:\[bot\])?,?/g'
3636
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
env:
1311
CARGO_TERM_COLOR: always

CONTRIBUTING.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,13 @@ Some notes on GitHub PRs:
151151

152152
- [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>
153153
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
154-
- 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.
155154
- All PRs must be reviewed and approved by at least one maintainer.
156155
- 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-rust/releases/).
157156

158157
## Release Process (for the internal team only)
159158

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

162-
### Automation to Rebase and Merge the PRs <!-- omit in toc -->
163-
164-
This project integrates a bot that helps us manage pull requests merging.<br>
165-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
166-
167161
### Automated Changelogs <!-- omit in toc -->
168162

169163
This project integrates a tool to create automated changelogs.<br>
@@ -194,7 +188,7 @@ and the [code-samples file](/.code-samples.meilisearch.yaml):
194188
with the right version.
195189

196190

197-
After the changes on `Cargo.toml`, run the following command:
191+
After the changes on `Cargo.toml`, run the following command:
198192

199193
```
200194
sh scripts/update_macro_versions.sh

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<a href="https://github.com/meilisearch/meilisearch-rust/actions"><img src="https://github.com/meilisearch/meilisearch-rust/workflows/Tests/badge.svg?branch=main" alt="Tests"></a>
2424
<a href="https://github.com/meilisearch/meilisearch-rust/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
2525
<a href="https://github.com/meilisearch/meilisearch/discussions" alt="Discussions"><img src="https://img.shields.io/badge/github-discussions-red" /></a>
26-
<a href="https://ms-bors.herokuapp.com/repositories/62"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
2726
<a href="https://codecov.io/gh/meilisearch/meilisearch-rust"><img src="https://codecov.io/gh/meilisearch/meilisearch-rust/graph/badge.svg?token=NVO9OI8JMG"/></a>
2827
</p>
2928

README.tpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<a href="https://github.com/meilisearch/meilisearch-rust/actions"><img src="https://github.com/meilisearch/meilisearch-rust/workflows/Tests/badge.svg?branch=main" alt="Tests"></a>
2424
<a href="https://github.com/meilisearch/meilisearch-rust/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
2525
<a href="https://github.com/meilisearch/meilisearch/discussions" alt="Discussions"><img src="https://img.shields.io/badge/github-discussions-red" /></a>
26-
<a href="https://ms-bors.herokuapp.com/repositories/62"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
2726
<a href="https://codecov.io/gh/meilisearch/meilisearch-rust"><img src="https://codecov.io/gh/meilisearch/meilisearch-rust/graph/badge.svg?token=NVO9OI8JMG"/></a>
2827
</p>
2928

0 commit comments

Comments
 (0)