docs(contrib): remove bors mentions

This commit is contained in:
Weihang Lo 2024-11-20 11:49:05 -05:00
parent a951c95b94
commit 3c86183881
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
3 changed files with 13 additions and 16 deletions

View File

@ -87,12 +87,12 @@ The Cargo project uses several bots:
* [GitHub Actions] are used to automatically run all tests for each PR. * [GitHub Actions] are used to automatically run all tests for each PR.
* [triagebot] automatically assigns reviewers for PRs, see [PR Assignment] for * [triagebot] automatically assigns reviewers for PRs, see [PR Assignment] for
how to configure. how to configure.
* [bors] is used to merge PRs. See [The merging process]. * [GitHub merge queue] is used to merge PRs. See [The merging process].
* [triagebot] is used for assigning issues to non-members, see [Issue * [triagebot] is used for assigning issues to non-members, see [Issue
assignment](#issue-assignment). assignment](#issue-assignment).
* [rfcbot] is used for making asynchronous decisions by team members. * [rfcbot] is used for making asynchronous decisions by team members.
[bors]: https://buildbot2.rust-lang.org/homu/ [GitHub merge queue]: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
[The merging process]: working-on-cargo.md#the-merging-process [The merging process]: working-on-cargo.md#the-merging-process
[GitHub Actions]: https://github.com/features/actions [GitHub Actions]: https://github.com/features/actions
[triagebot]: https://forge.rust-lang.org/triagebot/index.html [triagebot]: https://forge.rust-lang.org/triagebot/index.html

View File

@ -156,20 +156,19 @@ More information about these commands can be found at the [shortcuts documentati
## The merging process ## The merging process
After a reviewer has approved your PR, they will issue a command to the [bors] After a reviewer has approved your PR,
bot (also known as "Homu", the software that powers [`@bors`]). Bors will they will add the PR to [GitHub merge queue].
create a temporary branch with your PR, and run all tests. Only if all tests The merge queue will create a temporary branch with your PR,
pass will it merge the PR to master. If it fails, the bot will leave a comment and run all required jobs.
on the PR. This system ensures that the master branch is always in a good If it fails, it will be removed from the queue.
state, and that merges are processed one at a time. The [Homu queue The merge queue ensures that the master branch is always in a good state,
dashboard][homu-cargo] shows the current merge queue. Cargo's queue is rarely and that merges are processed one at a time.
busy, but a busy project like the [rust repo][homu-rust] is constantly full. The [merge queue dashboard] shows the current queued pull requests.
Assuming everything works, congratulations! It may take at least a week for Assuming everything works, congratulations! It may take at least a week for
the changes to arrive on the nightly channel. See the [release chapter] for the changes to arrive on the nightly channel. See the [release chapter] for
more information on how Cargo releases are made. more information on how Cargo releases are made.
[development-models]: https://help.github.com/articles/about-collaborative-development-models/ [development-models]: https://help.github.com/articles/about-collaborative-development-models/
[create pull requests]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request [create pull requests]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
[how-to-fork]: https://docs.github.com/en/github/getting-started-with-github/fork-a-repo [how-to-fork]: https://docs.github.com/en/github/getting-started-with-github/fork-a-repo
@ -179,10 +178,8 @@ more information on how Cargo releases are made.
[how-to-clone]: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository [how-to-clone]: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository
[Testing chapter]: ../tests/index.md [Testing chapter]: ../tests/index.md
[GitHub's keywords]: https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue [GitHub's keywords]: https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue
[bors]: https://buildbot2.rust-lang.org/homu/ [GitHub merge queue]: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
[`@bors`]: https://github.com/bors [merge queue dashboard]: https://github.com/rust-lang/cargo/queue/master
[homu-cargo]: https://buildbot2.rust-lang.org/homu/queue/cargo
[homu-rust]: https://buildbot2.rust-lang.org/homu/queue/rust
[release chapter]: release.md [release chapter]: release.md
[internals forum]: https://internals.rust-lang.org/c/tools-and-infrastructure/cargo [internals forum]: https://internals.rust-lang.org/c/tools-and-infrastructure/cargo
[file an issue]: https://github.com/rust-lang/cargo/issues [file an issue]: https://github.com/rust-lang/cargo/issues

View File

@ -48,7 +48,7 @@ Members are required to always:
Members are given privileges, such as: Members are given privileges, such as:
- Merge permissions (bors rights) - Merge permissions (GitHub permissions)
- Issue and project management (GitHub permissions) - Issue and project management (GitHub permissions)
- Voting and decision making (RFCs, major changes) - Voting and decision making (RFCs, major changes)
- Access to private communications related to team management and security discussions - Access to private communications related to team management and security discussions