Skip to content

Commit 5dbda8b

Browse files
authored
chore: remove bors mentions (#14845)
### What does this PR try to resolve? Cargo has moved to GitHub merge queue. These are the last vestiges of bors 🥲 👋🏾.
2 parents fbbc176 + c618f45 commit 5dbda8b

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

.github/PULL_REQUEST_TEMPLATE.md

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

ci/validate-version-bump.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
set -euo pipefail
1313

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

src/doc/contrib/src/process/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ The Cargo project uses several bots:
8787
* [GitHub Actions] are used to automatically run all tests for each PR.
8888
* [triagebot] automatically assigns reviewers for PRs, see [PR Assignment] for
8989
how to configure.
90-
* [bors] is used to merge PRs. See [The merging process].
90+
* [GitHub merge queue] is used to merge PRs. See [The merging process].
9191
* [triagebot] is used for assigning issues to non-members, see [Issue
9292
assignment](#issue-assignment).
9393
* [rfcbot] is used for making asynchronous decisions by team members.
9494

95-
[bors]: https://buildbot2.rust-lang.org/homu/
95+
[GitHub merge queue]: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
9696
[The merging process]: working-on-cargo.md#the-merging-process
9797
[GitHub Actions]: https://github.com/features/actions
9898
[triagebot]: https://forge.rust-lang.org/triagebot/index.html

src/doc/contrib/src/process/working-on-cargo.md

+10-13
Original file line numberDiff line numberDiff line change
@@ -156,20 +156,19 @@ More information about these commands can be found at the [shortcuts documentati
156156

157157
## The merging process
158158

159-
After a reviewer has approved your PR, they will issue a command to the [bors]
160-
bot (also known as "Homu", the software that powers [`@bors`]). Bors will
161-
create a temporary branch with your PR, and run all tests. Only if all tests
162-
pass will it merge the PR to master. If it fails, the bot will leave a comment
163-
on the PR. This system ensures that the master branch is always in a good
164-
state, and that merges are processed one at a time. The [Homu queue
165-
dashboard][homu-cargo] shows the current merge queue. Cargo's queue is rarely
166-
busy, but a busy project like the [rust repo][homu-rust] is constantly full.
159+
After a reviewer has approved your PR,
160+
they will add the PR to [GitHub merge queue].
161+
The merge queue will create a temporary branch with your PR,
162+
and run all required jobs.
163+
If it fails, it will be removed from the queue.
164+
The merge queue ensures that the master branch is always in a good state,
165+
and that merges are processed one at a time.
166+
The [merge queue dashboard] shows the current queued pull requests.
167167

168168
Assuming everything works, congratulations! It may take at least a week for
169169
the changes to arrive on the nightly channel. See the [release chapter] for
170170
more information on how Cargo releases are made.
171171

172-
173172
[development-models]: https://help.github.com/articles/about-collaborative-development-models/
174173
[create pull requests]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
175174
[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.
179178
[how-to-clone]: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository
180179
[Testing chapter]: ../tests/index.md
181180
[GitHub's keywords]: https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue
182-
[bors]: https://buildbot2.rust-lang.org/homu/
183-
[`@bors`]: https://github.com/bors
184-
[homu-cargo]: https://buildbot2.rust-lang.org/homu/queue/cargo
185-
[homu-rust]: https://buildbot2.rust-lang.org/homu/queue/rust
181+
[GitHub merge queue]: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
182+
[merge queue dashboard]: https://github.com/rust-lang/cargo/queue/master
186183
[release chapter]: release.md
187184
[internals forum]: https://internals.rust-lang.org/c/tools-and-infrastructure/cargo
188185
[file an issue]: https://github.com/rust-lang/cargo/issues

src/doc/contrib/src/team.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Members are required to always:
4848

4949
Members are given privileges, such as:
5050

51-
- Merge permissions (bors rights)
51+
- Merge permissions (GitHub permissions)
5252
- Issue and project management (GitHub permissions)
5353
- Voting and decision making (RFCs, major changes)
5454
- Access to private communications related to team management and security discussions

0 commit comments

Comments
 (0)