Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Commit

Permalink
chore(bors): bors should block on label awaiting-CI (#9478)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcommelin committed Oct 1, 2021
1 parent 5936f53 commit 38395ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ status = ["Build mathlib", "Lint mathlib", "Run tests", "Lint style"]
# status = ["Build mathlib (fork)", "Lint mathlib (fork)", "Run tests (fork)", "Lint style (fork)"]
use_squash_merge = true
timeout_sec = 28800
block_labels = ["not-ready-to-merge", "WIP", "blocked-by-other-PR", "merge-conflict"]
block_labels = ["not-ready-to-merge", "WIP", "blocked-by-other-PR", "merge-conflict", "awaiting-CI"]
delete_merged_branches = true
cut_body_after = "---"
8 changes: 4 additions & 4 deletions docs/contribute/bors.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ more details.)

- Using bors is very similar to the previous mergify-based workflow, except that instead of
approving and adding the "ready-to-merge" label, maintainers just need to remove any "blocked
labels" ("WIP", "changes-requested", "not-ready-to-merge", "blocked-by-other-PR") and then add a
comment to the PR containing "`bors r+`" (or "`bors merge`") on its own line. This will add the PR
to the last batch in the bors queue. This can be cancelled by commenting with "`bors r-`" /
"`bors merge-`".
labels" ("not-ready-to-merge", "WIP", "blocked-by-other-PR", "merge-conflict", "awaiting-CI")
and then add a comment to the PR containing "`bors r+`" (or "`bors merge`") on its own line.
This will add the PR to the last batch in the bors queue. This can be cancelled by commenting with
"`bors r-`" / "`bors merge-`".

- We have a Github Actions workflow which will try to label approved PRs with
"ready-to-merge" so that we can see at a glance which open PRs are in the queue. It's not perfect,
Expand Down

0 comments on commit 38395ed

Please sign in to comment.