Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch cargo from bors to merge-queue #1590

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Switch cargo from bors to merge-queue #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions people/Mark-Simulacrum.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ zulip-id = 116122
irc = "simulacrum"
email = "[email protected]"
discord-id = 442403469580566528

[permissions]
bors.cargo.review = true
3 changes: 0 additions & 3 deletions people/steveklabnik.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@ github = "steveklabnik"
github-id = 27786
email = "[email protected]"
discord-id = 271866667292819456

[permissions]
bors.cargo.review = true
3 changes: 2 additions & 1 deletion repos/rust-lang/cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ org = "rust-lang"
name = "cargo"
description = "The Rust package manager"
homepage = "https://doc.rust-lang.org/cargo"
bots = ["bors", "rustbot", "rfcbot", "renovate"]
bots = ["rustbot", "rfcbot", "renovate"]

[access.teams]
cargo = "write"

[[branch-protections]]
pattern = "master"
ci-checks = ["conclusion"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ci-checks will be needed on the rust-1.* branch protection, too. We use those for beta backports.

Copy link
Contributor

@ehuss ehuss Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or...hm.. Merge queues don't support * patterns. That's...unfortunate.

I suppose we can merge without using queues, since we almost never have more than one PR targeting a branch at once. We can assume the PR is up-to-date. Perhaps we could expose the "Require branches to be up to date before merging" setting for the beta branches?

Copy link
Contributor Author

@Kobzol Kobzol Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's needed only for cargo (and rust-lang/rust), I would just configure it manually. TIL about the * limitation, that's annoying.


[[branch-protections]]
pattern = "rust-1.*"
1 change: 0 additions & 1 deletion teams/cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ alumni = [

[permissions]
bors.rust.review = true
bors.cargo.review = true
crater = true
perf = true

Expand Down