Skip to content

Commit 9c9ecb1

Browse files
Rollup merge of rust-lang#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: - https://github.com/rust-lang/bors/blob/e1fafaa3b89c225069fa2aa1193096e1d66075c3/src/bors/merge_queue.rs#L101 - https://github.com/rust-lang/bors/blob/bf491ee40d1fc877af273f2ec92a2968dee8cdb7/src/github/api/mod.rs#L159 - rust-lang#112049 (comment) We can resume it quickly with a command, to test how the merging functionality behaves.
2 parents 58b1130 + 1925afb commit 9c9ecb1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

rust-bors.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ labels_blocking_approval = [
2929
# If CI runs quicker than this duration, consider it to be a failure
3030
min_ci_time = 600
3131

32-
# Flip this once new bors is used for actual merges on this repository
33-
merge_queue_enabled = false
32+
merge_queue_enabled = true
3433
report_merge_conflicts = true
3534

3635
[labels]
@@ -55,7 +54,9 @@ try_failed = [
5554
"-S-waiting-on-review",
5655
"-S-waiting-on-crater"
5756
]
58-
auto_build_succeeded = ["+merged-by-bors"]
57+
auto_build_succeeded = [
58+
"+merged-by-bors"
59+
]
5960
auto_build_failed = [
6061
"+S-waiting-on-review",
6162
"-S-blocked",

0 commit comments

Comments
 (0)