From a14accd0a2e2b9eaf05aeaef117c1bed02d60f19 Mon Sep 17 00:00:00 2001 From: ad hoc Date: Tue, 2 May 2023 11:25:36 +0200 Subject: [PATCH] enable merge queues (#377) * enable merge queues * remove borst config --- .github/workflows/rust.yml | 1 + bors.toml | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 bors.toml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0b8b78ef..65dfddb2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -4,6 +4,7 @@ on: push: branches: [ "main", "trying", "staging" ] pull_request: + merge_group: branches: [ "main" ] env: diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 5dd76708..00000000 --- a/bors.toml +++ /dev/null @@ -1,9 +0,0 @@ -status = [ - "Run Clippy", - "Run Rustfmt", - "Run Tests", - "Build Docker", - "Run Checks" -] -# 3 hours timeout -timeout-sec = 10800