From dfa8fe89ec465f527a31f6f784bd04be3ff26f84 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Fri, 10 Jul 2026 12:07:45 +0200 Subject: [PATCH 1/2] ci: automate Dependabot updates and auto-merge Motivation: Automate GHA workflow updates via Dependabot and automatically squash-merge them when CI passes to eliminate manual maintenance. Design Choices: Configured Dependabot for github-actions and added a squash auto-merge Mergify rule for `dependabot[bot]`. Removed obsolete delayed-merge rules. Benefits: Saves maintainer time by fully automating dependency updates with high security while preserving clean linear git history. --- .mergify.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 1cd1778..10cafa4 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -30,6 +30,15 @@ pull_request_rules: actions: merge: method: merge + - name: automatic merge for dependabot updates + conditions: + - and: *base_checks + - and: + - base=master + - author=dependabot[bot] + actions: + merge: + method: squash - name: ask to resolve conflict conditions: - conflict From 36f435e43d670d9e3939822bb8d5e57c837ddacc Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Fri, 10 Jul 2026 13:41:49 +0200 Subject: [PATCH 2/2] ci(mergify): remove annoying rule about conflict resolution Same as was done in other projects. --- .mergify.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 10cafa4..ca4518f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -39,9 +39,3 @@ pull_request_rules: actions: merge: method: squash - - name: ask to resolve conflict - conditions: - - conflict - actions: - comment: - message: This pull request is now in conflicts. Could you fix it? 🙏