From 567b7df197c7c59fa5a5ec159f92779520eabac9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 1 Feb 2023 13:58:25 +0100 Subject: [PATCH] ci: `bot_account` is not available for our Mergify usage `bot_account` is a feature that is part of the paid subscription. The Ceph organization does not have that. Mergify will use the author of the PR for rebasing by default. This isn't very nice, but we can't change it at the moment. Signed-off-by: Niels de Vos --- .mergify.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 2a4373276..6484ea4ab 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,9 +9,13 @@ defaults: method: rebase rebase_fallback: merge update_method: rebase - rebase: + # For rebasing Mergify uses the author of the PR. Ideally we use the + # ceph-csi-bot for that, but this is a feature that needs a paid + # subscription. + # + # rebase: # Use ceph-csi-bot for rebasing, not the account of the PR owner. - bot_account: ceph-csi-bot + # bot_account: ceph-csi-bot queue_rules: - name: default