From b6efe649262d14286b5982e50f0e5d7267449745 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 17:07:50 +0000
Subject: [PATCH 1/2] build(deps): bump peaceiris/actions-gh-pages from 3 to 4

Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/gh-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 27a1c6cb..9f64095b 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -30,7 +30,7 @@ jobs:
           echo "result=$(readlink ./result)" >> $GITHUB_OUTPUT
       
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         if: github.ref == 'refs/heads/main'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From 91f884deb61e47f5180849a07c131a91bdb76270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 2 May 2024 13:08:49 +0200
Subject: [PATCH 2/2] update mergify rules

---
 .mergify.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index bc261914..aeea4e06 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,22 +1,19 @@
 queue_rules:
   - name: default
     merge_conditions:
-      - check-success=Evaluate flake.nix
+      - check-success=buildbot/nix-eval
       - check-success=build (macos-latest)
       - check-success=build (ubuntu-latest)
       - check-success=build_and_test (macos-latest)
       - check-success=build_and_test (ubuntu-latest)
       - check-success=build_and_test (windows-2019)
+      - check-success=clippy
       - check-success=clippy_check
-      - check-success=devShell default [x86_64-linux]
       - check-success=gh-pages
-      - check-success=package default [x86_64-linux]
-      - check-success=package docs [x86_64-linux]
 defaults:
   actions:
     queue:
-      allow_merging_configuration_change: true
-      method: rebase
+      merge_method: rebase
 pull_request_rules:
   - name: merge using the merge queue
     conditions: