From b0f82bcf524924fa9672be7f81292731d7d8c133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Sep 2023 10:56:21 +0200 Subject: [PATCH] replace bors with mergify bors no longer works for merge queues. --- .mergify.yml | 16 ++++++++++++++++ bors.toml | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .mergify.yml delete mode 100644 bors.toml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..fe7af7f --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,16 @@ +queue_rules: + - name: default + merge_conditions: + - check-success=tests +defaults: + actions: + queue: + allow_merging_configuration_change: true + method: rebase +pull_request_rules: + - name: merge using the merge queue + conditions: + - base=master + - label~=merge-queue|dependencies + actions: + queue: {} diff --git a/bors.toml b/bors.toml deleted file mode 100644 index b750afa..0000000 --- a/bors.toml +++ /dev/null @@ -1,2 +0,0 @@ -cut_body_after = "" # don't include text from the PR body in the merge commit message -status = [ "tests" ]