Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
- [AWS regions](./infra/docs/aws-regions.md)
- [Bastion server](./infra/docs/bastion.md)
- [Bors](./infra/docs/bors.md)
- [Fixing bors queue](./infra/docs/bors/queue-resync.md)
- [CDN](./infra/docs/cdn.md)
- [Crater agents](./infra/docs/crater-agents.md)
- [Dev Desktops](./infra/docs/dev-desktop.md)
Expand Down
12 changes: 2 additions & 10 deletions src/infra/docs/bors.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
# Bors

<!-- FIXME: update bors info -->

The infrastructure team manages an instance of [Homu] called "Bors", to be used
for `rust-lang/rust`. The instance is available
at [bors.rust-lang.org], and is backed by the [@bors] GitHub account.

The service is configured [with Terraform][tf], and it's automatically deployed
from the [rust-lang/homu] repository onto our [ECS cluster][ecs].

## Maintenance procedures

### Fixing inconsistencies in the queue

Homu is quite buggy, and it might happen that the queue doesn't reflect the
actual state in the repositories.

See [Fixing inconsistencies in the bors queue](./bors/queue-resync.md) for
instructions on how to do this properly.

[@bors]: https://github.com/bors
[Homu]: https://github.com/rust-lang/homu
[bors.rust-lang.org]: https://bors.rust-lang.org
Expand Down
147 changes: 0 additions & 147 deletions src/infra/docs/bors/queue-resync.md

This file was deleted.

2 changes: 1 addition & 1 deletion src/libs/maintaining-std.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ To try reduce noise in the docs from deprecated items, they should be moved to t
[`rust-lang/rfcs`]: https://github.com/rust-lang/rfcs
[`rust-lang/rust-forge`]: https://github.com/rust-lang/rust-forge
[`rfcbot`]: https://github.com/rust-lang/rfcbot-rs
[`bors`]: https://github.com/rust-lang/homu
[`bors`]: https://github.com/rust-lang/bors
[pr_assignment]: ../triagebot/pr-assignment.md
[`crater`]: https://github.com/rust-lang/crater
[`rust-timer`]: https://github.com/rust-lang-nursery/rustc-perf
Expand Down
4 changes: 2 additions & 2 deletions src/release/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ support.

### External Links

* The [Homu/Bors] page provides links to the pull request testing queues for the
* The [bors] page provides links to the pull request testing queues for the
`rust-lang` GitHub organisation, as well as providing an overview of the bot's
syntax you can use to interact with it.
* [Rustup Component History] documents when a component was last available (if
Expand All @@ -17,5 +17,5 @@ support.

[Rustup Component History]: https://rust-lang.github.io/rustup-components-history/index.html
[PR Tracking]: https://rust-lang-nursery.github.io/rustc-pr-tracking/
[Homu/Bors]: https://bors.rust-lang.org/
[bors]: https://bors.rust-lang.org/
[`rustup-toolchain-install-master`]: https://github.com/kennytm/rustup-toolchain-install-master
6 changes: 3 additions & 3 deletions src/release/rollups.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ command accepts four values `always`, `maybe`, `iffy`, and `never`. See [the
Rollups section] of the review policies for guidance on what these different
statuses mean.

You can see the list of rollup PRs on Rust's [Homu queue], they are
You can see the list of rollup PRs on Rust's [bors queue], they are
listed at the bottom of the 'approved' queue with a priority of 'rollup' meaning
they will not be merged by themselves until everything in front of them in the
queue has been merged.

## Making a Rollup

1. Using the interface on [Homu queue], select pull requests and then
1. Using the interface on [bors queue], select pull requests and then
use "rollup" button to make a rollup pull request. (The text about
fairness can be ignored.)
**Important note**: consider for addition PRs marked as
Expand Down Expand Up @@ -85,5 +85,5 @@ or confirm your hypothesis.
If a rollup continues to fail you can run the `@bors rollup=never` command to
never rollup the PR in question.

[Homu queue]: https://bors.rust-lang.org/queue/rust
[bors queue]: https://bors.rust-lang.org/queue/rust
[the Rollups section]: ../compiler/reviews.md#rollups
2 changes: 1 addition & 1 deletion src/release/triage-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ not need a review yet.)
[s-experimental]: https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3AS-experimental+sort%3Aupdated-asc
[no-status-tags]: https://github.com/rust-lang/rust/pulls?q=is%3Apr+is%3Aopen+-label%3AS-waiting-on-author+-label%3AS-waiting-on-review+-label%3AS-waiting-on-team+-label%3AS-waiting-on-bors+-label%3AS-waiting-on-crater+-label%3AS-waiting-on-bikeshed+-label%3AS-waiting-on-perf+-label%3AS-blocked+-label%3AS-inactive+-label%3AS-waiting-on-fcp+-label%3AS-waiting-on-ACP+-label%3AS-experimental
[crater]: https://github.com/rust-lang-nursery/crater
[bors]: https://github.com/rust-lang/homu
[bors]: https://github.com/rust-lang/bors

### Procedure

Expand Down