Skip to content

Commit 641efb4

Browse files
authored
Merge pull request #502 from meilisearch/remove-bors
Remove bors and use GitHub merge queue
2 parents a365db9 + 445b84b commit 641efb4

File tree

5 files changed

+1
-20
lines changed

5 files changed

+1
-20
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ Dockerfile
4141

4242
# Project files
4343
.editorconfig
44-
bors.toml
4544
CONTRIBUTING.md
4645
README.md
4746
assets/

.github/release-draft-template.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ template: |
2727
Thanks again to $CONTRIBUTORS! 🎉
2828
no-changes-template: 'Changes will arrive soon 😎'
2929
sort-direction: 'ascending'
30-
replacers:
31-
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
32-
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
linter:

CONTRIBUTING.md

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

112112
- [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>
113113
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
114-
- 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.
115114
- All PRs must be reviewed and approved by at least one maintainer.
116115
- 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-scraper/releases/).
117116

118117
## Release Process (for the internal team only)
119118

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

122-
### Automation to Rebase and Merge the PRs <!-- omit in TOC -->
123-
124-
This project integrates a bot that helps us manage pull requests merging.<br>
125-
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._
126-
127121
### Automated Changelogs <!-- omit in TOC -->
128122

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

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<p align="center">
1818
<a href="https://github.com/meilisearch/docs-scraper/actions"><img src="https://github.com/meilisearch/docs-scraper/workflows/Tests/badge.svg" alt="GitHub Workflow Status"></a>
1919
<a href="https://github.com/meilisearch/docs-scraper/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
20-
<a href="https://ms-bors.herokuapp.com/repositories/44"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
2120
</p>
2221

2322
---
@@ -546,12 +545,6 @@ Websites that need JavaScript for rendering are passed through ChromeDriver.<br>
546545

547546
This package guarantees compatibility with [version v1.x of Meilisearch](https://github.com/meilisearch/meilisearch/releases/latest), but some features may not be present. Please check the [issues](https://github.com/meilisearch/docs-scraper/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+label%3Aenhancement) for more info.
548547

549-
## ⚙️ Development Workflow and Contributing
550-
551-
Any new contribution is more than welcome in this project!
552-
553-
If you want to know more about the development workflow or want to contribute, please visit our [contributing guidelines](/CONTRIBUTING.md) for detailed instructions!
554-
555548
## Credits
556549

557550
Based on [Algolia's docsearch scraper repository](https://github.com/algolia/docsearch-scraper) from [this commit](https://github.com/algolia/docsearch-scraper/commit/aab0888989b3f7a4f534979f0148f471b7c435ee).<br>

0 commit comments

Comments
 (0)