Rollup merge of #150708 - Kobzol:merge-queue, r=marcoieni
Enable merge queue in new bors We can proactively merge this now. Note that new bors will still default to being "paused" and not running the merge queue, after being restarted: -e1fafaa3b8/src/bors/merge_queue.rs (L101)-bf491ee40d/src/github/api/mod.rs (L159)- https://github.com/rust-lang/rust/pull/112049#issuecomment-3714114478 We can resume it quickly with a command, to test how the merging functionality behaves.
This commit is contained in:
commit
9c9ecb18bc
1 changed files with 4 additions and 3 deletions
|
|
@ -29,8 +29,7 @@ labels_blocking_approval = [
|
|||
# If CI runs quicker than this duration, consider it to be a failure
|
||||
min_ci_time = 600
|
||||
|
||||
# Flip this once new bors is used for actual merges on this repository
|
||||
merge_queue_enabled = false
|
||||
merge_queue_enabled = true
|
||||
report_merge_conflicts = true
|
||||
|
||||
[labels]
|
||||
|
|
@ -55,7 +54,9 @@ try_failed = [
|
|||
"-S-waiting-on-review",
|
||||
"-S-waiting-on-crater"
|
||||
]
|
||||
auto_build_succeeded = ["+merged-by-bors"]
|
||||
auto_build_succeeded = [
|
||||
"+merged-by-bors"
|
||||
]
|
||||
auto_build_failed = [
|
||||
"+S-waiting-on-review",
|
||||
"-S-blocked",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue