From b7719bef5d25f99297bc98c70db78d95e9eb2f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Dec 2023 11:54:07 +0100 Subject: [PATCH] update mergify configuration --- .mergify.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 1ddf821..43647be 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,29 +2,34 @@ queue_rules: - name: default merge_conditions: - check-success=Evaluate flake.nix - - check-success=check kexec-installer-2305 [x86_64-linux] + - check-success=check kexec-installer-2311 [x86_64-linux] - check-success=check kexec-installer-unstable [x86_64-linux] - check-success=check shellcheck [x86_64-linux] - - check-success=package kexec-installer-nixos-2305 [aarch64-linux] - - check-success=package kexec-installer-nixos-2305 [x86_64-linux] - - check-success=package kexec-installer-nixos-2305-noninteractive [aarch64-linux] - - check-success=package kexec-installer-nixos-2305-noninteractive [x86_64-linux] + - check-success=images (nixos-23.11, nscloud-ubuntu-22.04-arm64-4x16) + - check-success=images (nixos-23.11, ubuntu-latest) + - check-success=images (nixos-unstable, nscloud-ubuntu-22.04-arm64-4x16) + - check-success=images (nixos-unstable, ubuntu-latest) + - check-success=package kexec-installer-nixos-2311 [aarch64-linux] + - check-success=package kexec-installer-nixos-2311 [x86_64-linux] + - check-success=package kexec-installer-nixos-2311-noninteractive [aarch64-linux] + - check-success=package kexec-installer-nixos-2311-noninteractive [x86_64-linux] - check-success=package kexec-installer-nixos-unstable [aarch64-linux] - check-success=package kexec-installer-nixos-unstable [x86_64-linux] - check-success=package kexec-installer-nixos-unstable-noninteractive [aarch64-linux] - check-success=package kexec-installer-nixos-unstable-noninteractive [x86_64-linux] - - check-success=package netboot-installer-nixos-2305 [aarch64-linux] - - check-success=package netboot-installer-nixos-2305 [x86_64-linux] + - check-success=package netboot-installer-nixos-2311 [aarch64-linux] + - check-success=package netboot-installer-nixos-2311 [x86_64-linux] - check-success=package netboot-installer-nixos-unstable [aarch64-linux] - check-success=package netboot-installer-nixos-unstable [x86_64-linux] - - check-success=package netboot-nixos-2305 [aarch64-linux] - - check-success=package netboot-nixos-2305 [x86_64-linux] + - check-success=package netboot-nixos-2311 [aarch64-linux] + - check-success=package netboot-nixos-2311 [x86_64-linux] - check-success=package netboot-nixos-unstable [aarch64-linux] - check-success=package netboot-nixos-unstable [x86_64-linux] defaults: actions: queue: allow_merging_configuration_change: true + method: rebase pull_request_rules: - name: merge using the merge queue conditions: