Skip to content

Conversation

@Kobzol
Copy link
Member

@Kobzol Kobzol commented Dec 23, 2025

Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's configuration file.

This PR also enables reporting of merge conflicts, so that we can test this part of bors on rust-lang/rust. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal.

r? @marcoieni

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2025
@marcoieni
Copy link
Member

LGTM. Feel free to r=me.

@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 23, 2025
@Kobzol
Copy link
Member Author

Kobzol commented Dec 23, 2025

Added an additional commit, to also enable the automation/bors/auto branch. It shouldn't have any effect on homu/the current setup, so we might as well do it immediately.

"-S-waiting-on-author",
"-S-waiting-on-crater",
"-S-waiting-on-review",
"-S-waiting-on-team"
Copy link
Member

@fmease fmease Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI this flag is deprecated. It's been superseded by S-waiting-on-t-*.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, we could enumerate the labels later, but first I wanted to achieve "feature parity" with homu. This only removes existing labels, so if they are not present, it won't really do anything.

@Kobzol
Copy link
Member Author

Kobzol commented Dec 23, 2025

@bors r=marcoieni

@bors
Copy link
Collaborator

bors commented Dec 23, 2025

📌 Commit bbf4ec3 has been approved by marcoieni

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 23, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 23, 2025
Update bors configuration

Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's [configuration file](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L46).

This PR also enables reporting of merge conflicts, so that we can test this part of bors on `rust-lang/rust`. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal.

r? `@marcoieni`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants