From c646ca06188406cbddabef2baf09c1de749ede8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 17 Jun 2024 08:50:23 +0200 Subject: [PATCH] fix mergify (#60) --- .mergify.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index fe96a39..a4bbc94 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,18 +1,11 @@ queue_rules: - name: default merge_conditions: - - check-success=Evaluate flake.nix - - check-success=check systemd-vaultd [x86_64-linux] - - check-success=check treefmt [x86_64-linux] - - check-success=check unittests [x86_64-linux] - - check-success=check vault-agent [x86_64-linux] - - check-success=devShell default [x86_64-linux] - - check-success=package default [x86_64-linux] + - check-success=buildbot/nix-eval defaults: actions: queue: - allow_merging_configuration_change: true - method: rebase + merge_method: rebase pull_request_rules: - name: merge using the merge queue conditions: