From 7593c2783d0f55da1d046212c5ef7706797a207a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 30 Aug 2023 15:37:17 +0200 Subject: [PATCH] mergify: switch to buildbot --- .mergify.yml | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a52ac17..b705ed0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,46 +1,16 @@ queue_rules: - name: default merge_conditions: - - check-success=Evaluate flake.nix - - check-success=check age-keys [x86_64-linux] - - check-success=check age-keys-23_05 [x86_64-linux] - - check-success=check age-ssh-keys [x86_64-linux] - - check-success=check age-ssh-keys-23_05 [x86_64-linux] - - check-success=check cross-build-23_05 [x86_64-linux] - - check-success=check default-23_05 [x86_64-linux] - - check-success=check lint-23_05 [x86_64-linux] - - check-success=check pgp-keys [x86_64-linux] - - check-success=check pgp-keys-23_05 [x86_64-linux] - - check-success=check pruning [x86_64-linux] - - check-success=check pruning-23_05 [x86_64-linux] - - check-success=check sops-init-gpg-key-23_05 [x86_64-linux] - - check-success=check sops-pgp-hook-23_05 [x86_64-linux] - - check-success=check sops-pgp-hook-test-23_05 [x86_64-linux] - - check-success=check ssh-keys-23_05 [x86_64-linux] - - check-success=check ssh-to-pgp-23_05 [x86_64-linux] - - check-success=check templates [x86_64-linux] - - check-success=check unit-tests-23_05 [x86_64-linux] - - check-success=check user-passwords [x86_64-linux] - - check-success=devShell default [x86_64-linux] - - check-success=package cross-build [x86_64-linux] - - check-success=package default [x86_64-linux] - - check-success=package lint [x86_64-linux] - - check-success=package sops-import-keys-hook [x86_64-linux] - - check-success=package sops-init-gpg-key [x86_64-linux] - - check-success=package sops-install-secrets [x86_64-linux] - - check-success=package sops-pgp-hook [x86_64-linux] - - check-success=package sops-pgp-hook-test [x86_64-linux] - - check-success=package unit-tests [x86_64-linux] - - check-success=tests + - check-success=buildbot/nix-eval defaults: actions: queue: allow_merging_configuration_change: true - method: rebase pull_request_rules: - name: merge using the merge queue conditions: - - base=master + - base=main - label~=merge-queue|dependencies actions: - queue: {} + queue: +