From e78aefbac4db0a58a7d7565c7c246499535c8d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 22 Oct 2024 22:46:30 +0200 Subject: [PATCH] Switch cargo from bors to merge-queue --- people/Mark-Simulacrum.toml | 3 --- people/steveklabnik.toml | 3 --- repos/rust-lang/cargo.toml | 3 ++- teams/cargo.toml | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/people/Mark-Simulacrum.toml b/people/Mark-Simulacrum.toml index 33eed9c52..452625b55 100644 --- a/people/Mark-Simulacrum.toml +++ b/people/Mark-Simulacrum.toml @@ -5,6 +5,3 @@ zulip-id = 116122 irc = "simulacrum" email = "mark.simulacrum@gmail.com" discord-id = 442403469580566528 - -[permissions] -bors.cargo.review = true diff --git a/people/steveklabnik.toml b/people/steveklabnik.toml index 223bdb3ae..d05274584 100644 --- a/people/steveklabnik.toml +++ b/people/steveklabnik.toml @@ -3,6 +3,3 @@ github = "steveklabnik" github-id = 27786 email = "steve@steveklabnik.com" discord-id = 271866667292819456 - -[permissions] -bors.cargo.review = true diff --git a/repos/rust-lang/cargo.toml b/repos/rust-lang/cargo.toml index f2785317a..594cff9a1 100644 --- a/repos/rust-lang/cargo.toml +++ b/repos/rust-lang/cargo.toml @@ -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"] [[branch-protections]] pattern = "rust-1.*" diff --git a/teams/cargo.toml b/teams/cargo.toml index 4c118acad..fd2bac5d4 100644 --- a/teams/cargo.toml +++ b/teams/cargo.toml @@ -25,7 +25,6 @@ alumni = [ [permissions] bors.rust.review = true -bors.cargo.review = true crater = true perf = true