From 0cf592f520a4cbb6e8b4e84e38988bee5e939cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 Jun 2024 13:59:30 +0200 Subject: [PATCH] add new tests to mergify configuration --- .github/workflows/test.yml | 1 + .mergify.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7c67a21..9d1999e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + # when updating channels, also update .mergify.yml channel: [ nixos-unstable, nixos-24.05 ] steps: - uses: actions/checkout@v4 diff --git a/.mergify.yml b/.mergify.yml index 45ffb1e..dc3bf77 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,8 @@ queue_rules: - name: default merge_conditions: - - check-success=tests + - check-success=tests (nixos-24.05) + - check-success=tests (nixos-unstable) defaults: actions: queue: