From b9d660b36dc7eb0090a45156f970bde486d80603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <mimmi20@live.de>
Date: Thu, 31 Oct 2024 09:01:57 +0100
Subject: [PATCH] update workflow

---
 .github/dependabot.yml             | 111 ++---------------------------
 .github/workflows/auto-approve.yml |  19 +++++
 .github/workflows/auto-merge.yml   |  21 ++++++
 3 files changed, 47 insertions(+), 104 deletions(-)
 create mode 100644 .github/workflows/auto-approve.yml
 create mode 100644 .github/workflows/auto-merge.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f0444a1..ed7d717 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,31 +10,10 @@ updates:
     directory: "/"
 
     schedule:
-      interval: "weekly"
-      day: "friday"
+      interval: "daily"
       time: "04:00"
       timezone: "Europe/Berlin"
 
-    groups:
-      security-updates:
-        applies-to: "security-updates"
-        patterns:
-          - "*"
-        exclude-patterns:
-          - "friendsofphp/php-cs-fixer"
-          - "sirbrillig/phpcs-variable-analysis"
-          - "slevomat/coding-standard"
-          - "squizlabs/php_codesniffer"
-      version-updates:
-        applies-to: "version-updates"
-        patterns:
-          - "*"
-        exclude-patterns:
-          - "friendsofphp/php-cs-fixer"
-          - "sirbrillig/phpcs-variable-analysis"
-          - "slevomat/coding-standard"
-          - "squizlabs/php_codesniffer"
-
     open-pull-requests-limit: 10
 
     reviewers:
@@ -54,9 +33,6 @@ updates:
       include: "scope"
       prefix: "composer"
 
-    #allow:
-    #  - '*'
-
     ignore:
       - dependency-name: "browscap/browscap"
       - dependency-name: "elasticsearch/elasticsearch"
@@ -83,92 +59,17 @@ updates:
       - dependency-name: "symfony/http-foundation"
       - dependency-name: "symfony/yaml"
 
-    # Disable rebasing for all pull requests
-    rebase-strategy: "disabled"
-
-  - package-ecosystem: "npm"
-
-    directory: "/"
-
-    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "04:00"
-      timezone: "Europe/Berlin"
-
-    groups:
-      security-updates:
-        applies-to: "security-updates"
-        patterns:
-          - "*"
-      version-updates:
-        applies-to: "version-updates"
-        patterns:
-          - "*"
-
-    open-pull-requests-limit: 10
-
-    reviewers:
-      - "mimmi20"
-
-    assignees:
-      - "mimmi20"
-
-    labels:
-      - "dependencies"
-
-    versioning-strategy: "increase"
-
-    target-branch: "master"
-
-    commit-message:
-      include: "scope"
-      prefix: "npm"
-
-    ignore:
-      - dependency-name: "@localnerve/imagemin-gifsicle"
-      - dependency-name: "@localnerve/imagemin-pngquant"
-      - dependency-name: "@node-minify/core"
-      - dependency-name: "@node-minify/no-compress"
-      - dependency-name: "@node-minify/terser"
-      - dependency-name: "@typescript-eslint/eslint-plugin"
-      - dependency-name: "@typescript-eslint/parser"
-      - dependency-name: "@typescript-eslint/typescript-estree"
-      - dependency-name: "@vheemstra/vite-plugin-imagemin"
-      - dependency-name: "@vitest/coverage-istanbul"
-      - dependency-name: "@vitest/ui"
-      - dependency-name: "cssnano"
-      - dependency-name: "cssnano-preset-default"
-      - dependency-name: "imagemin"
-      - dependency-name: "postcss-load-config"
-      - dependency-name: "supports-color"
-      - dependency-name: "vitest"
-
-    # Disable rebasing for all pull requests
-    rebase-strategy: "disabled"
+    rebase-strategy: "auto"
 
   - package-ecosystem: "github-actions"
 
     directory: "/"
 
     schedule:
-      interval: "weekly"
-      day: "friday"
+      interval: "daily"
       time: "04:00"
       timezone: "Europe/Berlin"
 
-    groups:
-      # Specify a name for the group, which will be used in pull request titles
-      # and branch names
-      security-updates:
-        applies-to: "security-updates"
-        patterns:
-          - "*"
-      version-updates:
-        applies-to: "version-updates"
-        patterns:
-          - "*"
-
     open-pull-requests-limit: 10
 
     reviewers:
@@ -185,5 +86,7 @@ updates:
     commit-message:
       prefix: "github-actions"
 
-    # Disable rebasing for all pull requests
-    rebase-strategy: "disabled"
+    ignore:
+      - dependency-name: "mimmi20/ci"
+
+    rebase-strategy: "auto"
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
new file mode 100644
index 0000000..a08b4a7
--- /dev/null
+++ b/.github/workflows/auto-approve.yml
@@ -0,0 +1,19 @@
+name: "Auto approve"
+
+on:
+  - pull_request_target
+
+jobs:
+  auto-approve:
+    runs-on: "ubuntu-24.04"
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - uses: "fastify/github-action-merge-dependabot@v3"
+        with:
+          approve-only: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
new file mode 100644
index 0000000..5c3c100
--- /dev/null
+++ b/.github/workflows/auto-merge.yml
@@ -0,0 +1,21 @@
+name: "Auto merge"
+
+on:
+  - pull_request_target
+
+jobs:
+  automerge:
+    runs-on: "ubuntu-24.04"
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    permissions:
+      pull-requests: write
+      contents: write
+
+    steps:
+      - uses: "fastify/github-action-merge-dependabot@v3"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          use-github-auto-merge: true
+          merge-method: "merge"