From f63a556380fa699c072adfeb4ca20578c40af7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 May 2025 12:39:18 +0200 Subject: [PATCH] github: switch to merge-queues --- .github/workflows/test.yml | 1 + .mergify.yml | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 .mergify.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 13b6537..89a8611 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,7 @@ name: "Test" on: pull_request: + merge_group: push: branches: - master diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index dd750c4..0000000 --- a/.mergify.yml +++ /dev/null @@ -1,16 +0,0 @@ -queue_rules: - - name: default - merge_conditions: - - check-success=buildbot/nix-build - - check-success=tests (ubuntu-latest, stable) - - check-success=tests (ubuntu-latest, latest) - - check-success=tests (ubuntu-latest, bash4) - batch_size: 5 - merge_method: rebase -pull_request_rules: - - name: merge using the merge queue - conditions: - - base=master - - label~=merge-queue|dependencies - actions: - queue: {}