Skip to content

Commit 58db714

Browse files
Rollup merge of #150478 - Kobzol:bors-config, r=jieyouxu
Fix new bors config I added the root config under `[labels]` by accident, so it failed to be deserialized by bors.
2 parents 5e16920 + 19c8ea4 commit 58db714

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rust-bors.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ 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
34+
report_merge_conflicts = true
35+
3236
[labels]
3337
approved = [
3438
"+S-waiting-on-bors",
@@ -60,7 +64,3 @@ auto_build_failed = [
6064
"-S-waiting-on-crater",
6165
"-S-waiting-on-team"
6266
]
63-
64-
# Flip this two once new bors is used for actual merges on this repository
65-
merge_queue_enabled = false
66-
report_merge_conflicts = true

0 commit comments

Comments
 (0)