Add approval blocking labels for new bors #144176
Merged
+17
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
Urgau
reviewed
Jul 19, 2025
rust-bors.toml
Outdated
| @@ -1,2 +1,5 @@ | |||
| # 6 hours timeout for CI builds | |||
| timeout = 21600 | |||
|
|
|||
| # Do not allow approving PRs that are waiting for a FCP to finish | |||
| labels_blocking_approval = ["final-comment-period", "proposed-final-comment-period"] | |||
There was a problem hiding this comment.
Do we also want to block on S-waiting-on-concerns ?
There was a problem hiding this comment.
There's also S-waiting-on-mcp, S-blocked, etc.
There was a problem hiding this comment.
Could authors also add a label for "do not merge" experimental PRs to further guard against them being merged?
There was a problem hiding this comment.
draft PRs already will not be eligible for r+, I think there's an check for [WIP in PR title too
There was a problem hiding this comment.
Could authors also add a label for "do not merge" experimental PRs to further guard against them being merged?
(There's also S-experimental)
There was a problem hiding this comment.
Would it be possible to also block certain combinations of labels or missing labels? For instance, could we block merging a PR that has needs-fcp and doesn't have both finished-final-comment-period and disposition-merge?
There was a problem hiding this comment.
It surely is possible to implement :D But it might be a bit complex to express these rules in a TOML config file. That being said, since new bors will most likely only be used for rust-lang/rust, we could also just hardcode it 🤷♂️
Kobzol
force-pushed
the
bors-labels-blocking
branch
from
8504c2e to
fc74c22
Compare
|
Added a bunch more labels, in particular |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jul 21, 2025
…-obk Add approval blocking labels for new bors If a PR contains these labels, new bors won't let anyone approve it. We don't merge PRs using new bors yet, ofc, but I wanted to prepare this so that I don't forget about it. This was proposed here: [#t-lang/meetings > Triage meeting 2025-07-23 @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/410673-t-lang.2Fmeetings/topic/Triage.20meeting.202025-07-23/near/529407150) and implemented [here](rust-lang/bors#367). CC `@RalfJung` r? `@oli-obk`
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jul 21, 2025
…-obk Add approval blocking labels for new bors If a PR contains these labels, new bors won't let anyone approve it. We don't merge PRs using new bors yet, ofc, but I wanted to prepare this so that I don't forget about it. This was proposed here: [#t-lang/meetings > Triage meeting 2025-07-23 @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/410673-t-lang.2Fmeetings/topic/Triage.20meeting.202025-07-23/near/529407150) and implemented [here](rust-lang/bors#367). CC ``@RalfJung`` r? ``@oli-obk``
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jul 21, 2025
…-obk Add approval blocking labels for new bors If a PR contains these labels, new bors won't let anyone approve it. We don't merge PRs using new bors yet, ofc, but I wanted to prepare this so that I don't forget about it. This was proposed here: [#t-lang/meetings > Triage meeting 2025-07-23 @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/410673-t-lang.2Fmeetings/topic/Triage.20meeting.202025-07-23/near/529407150) and implemented [here](rust-lang/bors#367). CC ```@RalfJung``` r? ```@oli-obk```
bors
added a commit
that referenced
this pull request
Jul 21, 2025
Rollup of 15 pull requests Successful merges: - #142097 (gpu offload host code generation) - #143430 (Lower extra lifetimes before normal generic params.) - #143672 (Fix Box allocator drop elaboration) - #143768 (Constify Try, From, TryFrom and relevant traits) - #143816 (Implement `check` for compiletest and RA using tool macro) - #143985 (rustc_public: de-StableMIR-ize) - #144027 (clippy: make tests work in stage 1) - #144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename) - #144176 (Add approval blocking labels for new bors) - #144187 (fix handling of base address for TypeId allocations) - #144212 (Remove the ptr_unique lang item) - #144243 (Subtree update of `rust-analyzer`) - #144246 (Don't use another main test file as auxiliary) - #144251 (rustc-dev-guide subtree update) - #144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
Jul 21, 2025
Rollup of 14 pull requests Successful merges: - #142097 (gpu offload host code generation) - #143430 (Lower extra lifetimes before normal generic params.) - #143768 (Constify Try, From, TryFrom and relevant traits) - #143816 (Implement `check` for compiletest and RA using tool macro) - #143985 (rustc_public: de-StableMIR-ize) - #144027 (clippy: make tests work in stage 1) - #144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename) - #144176 (Add approval blocking labels for new bors) - #144187 (fix handling of base address for TypeId allocations) - #144212 (Remove the ptr_unique lang item) - #144243 (Subtree update of `rust-analyzer`) - #144246 (Don't use another main test file as auxiliary) - #144251 (rustc-dev-guide subtree update) - #144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jul 21, 2025
Rollup merge of #144176 - Kobzol:bors-labels-blocking, r=oli-obk Add approval blocking labels for new bors If a PR contains these labels, new bors won't let anyone approve it. We don't merge PRs using new bors yet, ofc, but I wanted to prepare this so that I don't forget about it. This was proposed here: [#t-lang/meetings > Triage meeting 2025-07-23 @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/410673-t-lang.2Fmeetings/topic/Triage.20meeting.202025-07-23/near/529407150) and implemented [here](rust-lang/bors#367). CC ````@RalfJung```` r? ````@oli-obk````
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Jul 22, 2025
Rollup of 14 pull requests Successful merges: - rust-lang/rust#142097 (gpu offload host code generation) - rust-lang/rust#143430 (Lower extra lifetimes before normal generic params.) - rust-lang/rust#143768 (Constify Try, From, TryFrom and relevant traits) - rust-lang/rust#143816 (Implement `check` for compiletest and RA using tool macro) - rust-lang/rust#143985 (rustc_public: de-StableMIR-ize) - rust-lang/rust#144027 (clippy: make tests work in stage 1) - rust-lang/rust#144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename) - rust-lang/rust#144176 (Add approval blocking labels for new bors) - rust-lang/rust#144187 (fix handling of base address for TypeId allocations) - rust-lang/rust#144212 (Remove the ptr_unique lang item) - rust-lang/rust#144243 (Subtree update of `rust-analyzer`) - rust-lang/rust#144246 (Don't use another main test file as auxiliary) - rust-lang/rust#144251 (rustc-dev-guide subtree update) - rust-lang/rust#144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`) r? `@ghost` `@rustbot` modify labels: rollup
github-actions bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Jul 24, 2025
Rollup of 14 pull requests Successful merges: - rust-lang/rust#142097 (gpu offload host code generation) - rust-lang/rust#143430 (Lower extra lifetimes before normal generic params.) - rust-lang/rust#143768 (Constify Try, From, TryFrom and relevant traits) - rust-lang/rust#143816 (Implement `check` for compiletest and RA using tool macro) - rust-lang/rust#143985 (rustc_public: de-StableMIR-ize) - rust-lang/rust#144027 (clippy: make tests work in stage 1) - rust-lang/rust#144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename) - rust-lang/rust#144176 (Add approval blocking labels for new bors) - rust-lang/rust#144187 (fix handling of base address for TypeId allocations) - rust-lang/rust#144212 (Remove the ptr_unique lang item) - rust-lang/rust#144243 (Subtree update of `rust-analyzer`) - rust-lang/rust#144246 (Don't use another main test file as auxiliary) - rust-lang/rust#144251 (rustc-dev-guide subtree update) - rust-lang/rust#144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`) r? `@ghost` `@rustbot` modify labels: rollup
github-actions bot
pushed a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Jul 28, 2025
Rollup of 14 pull requests Successful merges: - rust-lang/rust#142097 (gpu offload host code generation) - rust-lang/rust#143430 (Lower extra lifetimes before normal generic params.) - rust-lang/rust#143768 (Constify Try, From, TryFrom and relevant traits) - rust-lang/rust#143816 (Implement `check` for compiletest and RA using tool macro) - rust-lang/rust#143985 (rustc_public: de-StableMIR-ize) - rust-lang/rust#144027 (clippy: make tests work in stage 1) - rust-lang/rust#144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename) - rust-lang/rust#144176 (Add approval blocking labels for new bors) - rust-lang/rust#144187 (fix handling of base address for TypeId allocations) - rust-lang/rust#144212 (Remove the ptr_unique lang item) - rust-lang/rust#144243 (Subtree update of `rust-analyzer`) - rust-lang/rust#144246 (Don't use another main test file as auxiliary) - rust-lang/rust#144251 (rustc-dev-guide subtree update) - rust-lang/rust#144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a PR contains these labels, new bors won't let anyone approve it. We don't merge PRs using new bors yet, ofc, but I wanted to prepare this so that I don't forget about it.
This was proposed here: #t-lang/meetings > Triage meeting 2025-07-23 @ 💬 and implemented here.
CC @RalfJung
r? @oli-obk