From 6f0a8c5917cf3f6b22678eb9686337445195ffff Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <mail@bennycode.com>
Date: Thu, 1 Oct 2026 16:16:59 +0200
Subject: [PATCH 1/2] ci: Fix Dependabot config and auto-merge workflow

The ignore rules for @types/node >= 19 and eslint >= 9 blocked all
updates for both packages, which are now on 26 and 10. They are removed.
TypeScript >= 7 is ignored instead, because it has no JavaScript compiler
API, which ts-morph and typescript-eslint need.

"day" was removed from both schedules, because Dependabot only uses it
for weekly intervals. Minor and patch npm updates are grouped into one
pull request per run, so they no longer conflict with each other.

The "Approve PR" step in the auto-merge workflow always failed, because
GitHub Actions is not allowed to approve pull requests in this repository.
Branch protection only requires the test-coverage check, not an approval,
so the step is removed.
---
 .github/dependabot.yml                   | 15 ++++++++-------
 .github/workflows/merge-dependencies.yml |  5 -----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cb02771..3b9e9a1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,14 +3,12 @@ updates:
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      day: 'tuesday'
       interval: 'monthly'
       time: '02:00'
       timezone: 'Europe/Berlin'
   - package-ecosystem: 'npm'
     directory: '/'
     schedule:
-      day: 'tuesday'
       interval: 'monthly'
       time: '02:00'
       timezone: 'Europe/Berlin'
@@ -21,10 +19,13 @@ updates:
     commit-message:
       prefix: 'chore'
       include: 'scope'
+    groups:
+      minor-and-patch:
+        update-types:
+          - 'minor'
+          - 'patch'
     ignore:
-      - dependency-name: '@types/node'
+      # TypeScript 7 has no JavaScript compiler API, which ts-morph and typescript-eslint need
+      - dependency-name: 'typescript'
         versions:
-          - '>= 19'
-      - dependency-name: 'eslint'
-        versions:
-          - '>= 9'
+          - '>= 7'
diff --git a/.github/workflows/merge-dependencies.yml b/.github/workflows/merge-dependencies.yml
index 980899b..197e28f 100644
--- a/.github/workflows/merge-dependencies.yml
+++ b/.github/workflows/merge-dependencies.yml
@@ -19,8 +19,3 @@ jobs:
           PR_URL: ${{ github.event.pull_request.html_url }}
           # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: 'Approve PR'
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From ebb99b7c052677c68231b872b177fb3a33dbf83b Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <mail@bennycode.com>
Date: Thu, 1 Oct 2026 16:19:07 +0200
Subject: [PATCH 2/2] ci: Keep the approval step in the auto-merge workflow

---
 .github/workflows/merge-dependencies.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/merge-dependencies.yml b/.github/workflows/merge-dependencies.yml
index 197e28f..980899b 100644
--- a/.github/workflows/merge-dependencies.yml
+++ b/.github/workflows/merge-dependencies.yml
@@ -19,3 +19,8 @@ jobs:
           PR_URL: ${{ github.event.pull_request.html_url }}
           # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: 'Approve PR'
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}