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`
bors added a commit that referenced this pull request Dec 23, 2025
Rollup of 5 pull requests

Successful merges:

 - #150182 (Don't export upstream monomorphizations from compiler-builtins)
 - #150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - #150308 (Update bors configuration)
 - #150311 (Avoid using env::temp when linking a binary)
 - #150314 (rustc-dev-guide subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Dec 24, 2025
Rollup of 6 pull requests

Successful merges:

 - #149800 (Fix ICE in normalization during closure capture analysis (#149746))
 - #150182 (Don't export upstream monomorphizations from compiler-builtins)
 - #150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - #150308 (Update bors configuration)
 - #150314 (rustc-dev-guide subtree update)
 - #150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ebfdc44 into rust-lang:main Dec 24, 2025
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 24, 2025
@Kobzol Kobzol deleted the bors-conf branch December 24, 2025 07:16
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 27, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#149800 (Fix ICE in normalization during closure capture analysis (rust-lang/rust#149746))
 - rust-lang/rust#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang/rust#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang/rust#150308 (Update bors configuration)
 - rust-lang/rust#150314 (rustc-dev-guide subtree update)
 - rust-lang/rust#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Dec 29, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#149800 (Fix ICE in normalization during closure capture analysis (rust-lang/rust#149746))
 - rust-lang/rust#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang/rust#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang/rust#150308 (Update bors configuration)
 - rust-lang/rust#150314 (rustc-dev-guide subtree update)
 - rust-lang/rust#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/rustc_codegen_cranelift that referenced this pull request Dec 29, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#149800 (Fix ICE in normalization during closure capture analysis (rust-lang/rust#149746))
 - rust-lang/rust#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang/rust#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang/rust#150308 (Update bors configuration)
 - rust-lang/rust#150314 (rustc-dev-guide subtree update)
 - rust-lang/rust#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu jieyouxu added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 9, 2026
@jieyouxu
Copy link
Member

jieyouxu commented Jan 9, 2026

Note: dual-tagging with beta/stable nominations since we might need to backport new bors related changes to beta/stable branches (in the very off chance there's somehow a stable point release needed for reasons).

Context: #t-infra > Testing new bors in production @ 💬

@jieyouxu jieyouxu mentioned this pull request Jan 9, 2026
@cuviper cuviper added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 9, 2026
@cuviper cuviper modified the milestones: 1.94.0, 1.93.0 Jan 9, 2026
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 9, 2026
rust-bors bot added a commit that referenced this pull request Jan 9, 2026
[beta] backports

- Revert "Rollup merge of #149147 - chenyukang:yukang-fix-unused_assignments-macro-gen-147648, r=JonathanBrouwer" #149657
- Don't lint on interior mutable `const` item coming from derefs #150166
- stdarch subtree update #150639 (partial)
- Update bors configuration #150308
- Update bors e-mail lookup #150783
- Make verify-channel.sh script compatible with new bors #150759

r? cuviper
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 beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. stable-nominated Nominated for backporting to the compiler in the stable channel. 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.

7 participants