Skip to content

Commit 0642476

Browse files
authored
Merge pull request #2727 from Kobzol/remove-homu-references
Remove references to homu and fix bors delegation command
2 parents e905666 + 32ab9cb commit 0642476

4 files changed

Lines changed: 8 additions & 13 deletions

File tree

src/about-this-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ You might also find the following sites useful:
103103
[tlgba]: https://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
104104
[ro]: https://www.rustaceans.org/
105105
[rctd]: tests/intro.md
106-
[cheatsheet]: https://bors.rust-lang.org/
106+
[cheatsheet]: https://bors.rust-lang.org/help
107107
[Miri]: https://github.com/rust-lang/miri
108-
[@bors]: https://github.com/bors
108+
[@bors]: https://github.com/rust-lang/bors
109109
[a GitHub repository]: https://github.com/rust-lang/rustc-dev-guide/
110110
[rustc API docs]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle
111111
[Forge]: https://forge.rust-lang.org/

src/compiler-team.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ Once you have made a number of individual PRs to rustc, we will often
9696
offer r+ privileges. This means that you have the right to instruct
9797
"bors" (the robot that manages which PRs get landed into rustc) to
9898
merge a PR
99-
([here are some instructions for how to talk to bors][homu-guide]).
99+
([here are some instructions for how to talk to bors][bors-guide]).
100100

101-
[homu-guide]: https://bors.rust-lang.org/
101+
[bors-guide]: https://bors.rust-lang.org/
102102

103103
The guidelines for reviewers are as follows:
104104

src/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ this can take a while and the queue can sometimes be long.
283283
Also, note that PRs are never merged by hand.
284284

285285
[@rustbot]: https://github.com/rustbot
286-
[@bors]: https://github.com/bors
286+
[@bors]: https://github.com/rust-lang/bors
287287

288288
### Opening a PR
289289

src/tests/ci.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ to help make the perf comparison as fair as possible.
198198
>
199199
> 3. Run the prescribed try jobs with `@bors try`. As aforementioned, this
200200
> requires the user to either (1) have `try` permissions or (2) be delegated
201-
> with `try` permissions by `@bors delegate` by someone who has `try`
201+
> with `try` permissions by `@bors delegate=try` by someone who has `try`
202202
> permissions.
203203
>
204204
> Note that this is usually easier to do than manually edit [`jobs.yml`].
@@ -213,10 +213,7 @@ the corresponding PR.
213213
Multiple try builds can execute concurrently across different PRs, but there can be at most
214214
a single try build running on a single PR at any given time.
215215
216-
Note that try builds are handled using the [new bors] implementation.
217-
218216
[rustc-perf]: https://github.com/rust-lang/rustc-perf
219-
[new bors]: https://github.com/rust-lang/bors
220217
221218
### Modifying CI jobs
222219
@@ -281,8 +278,7 @@ Breakages like these usually happen when another, incompatible PR is merged
281278
after the build happened.
282279

283280
To ensure a `main` branch that works all the time, we forbid manual merges.
284-
Instead, all PRs have to be approved through our bot, [bors] (the software
285-
behind it is called [homu]).
281+
Instead, all PRs have to be approved through our bot, [bors].
286282
All the approved PRs are put in a [merge queue]
287283
(sorted by priority and creation date) and are automatically tested one at the time.
288284
If all the builders are green, the PR is merged, otherwise the failure is
@@ -465,8 +461,7 @@ To do this:
465461
[`jobs.yml`]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/github-actions/jobs.yml
466462
[`.github/workflows/ci.yml`]: https://github.com/rust-lang/rust/blob/HEAD/.github/workflows/ci.yml
467463
[`src/ci/citool`]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/citool
468-
[bors]: https://github.com/bors
469-
[homu]: https://github.com/rust-lang/homu
464+
[bors]: https://github.com/rust-lang/bors
470465
[merge queue]: https://bors.rust-lang.org/queue/rust
471466
[dist-x86_64-linux]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
472467
[the GitHub Actions workflows page]: https://github.com/rust-lang/rust/actions

0 commit comments

Comments
 (0)