itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2026-05-02 23:24:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove bors mentions (#14845)

Browse Source 
### What does this PR try to resolve?

Cargo has moved to GitHub merge queue. These are the last vestiges of
bors 🥲 👋🏾.
This commit is contained in:
Ed Page
2024-11-20 17:32:46 +00:00
committed by GitHub
parent fbbc17680b c618f450a2
commit 5dbda8b4ee
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@@ -1,4 +1,3 @@
<!-- homu-ignore:start -->
<!-- <!--
Thanks for submitting a pull request 🎉! Here are some tips for you: Thanks for submitting a pull request 🎉! Here are some tips for you:
@@ -35,4 +34,3 @@ https://doc.crates.io/contrib/tests
Other information you want to mention in this PR, such as prior arts, Other information you want to mention in this PR, such as prior arts,
future extensions, an unresolved problem, or a TODO list. future extensions, an unresolved problem, or a TODO list.
--> -->
<!-- homu-ignore:end -->

2
ci/validate-version-bump.sh
View File

@@ -11,7 +11,7 @@
set -euo pipefail set -euo pipefail
# When `BASE_SHA` is missing, we assume it is from bors merge commit, # When `BASE_SHA` is missing, we assume it is from GitHub merge queue merge commit,
# so hope `HEAD~` to find the previous commit on master branch. # so hope `HEAD~` to find the previous commit on master branch.
base_sha=$(git rev-parse "${BASE_SHA:-HEAD~1}") base_sha=$(git rev-parse "${BASE_SHA:-HEAD~1}")
head_sha=$(git rev-parse "${HEAD_SHA:-HEAD}") head_sha=$(git rev-parse "${HEAD_SHA:-HEAD}")

4
src/doc/contrib/src/process/index.md
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

23
src/doc/contrib/src/process/working-on-cargo.md
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

2
src/doc/contrib/src/team.md
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