From 15b834e5a8c61d8120ad2d4d59a755accd4400ad Mon Sep 17 00:00:00 2001
From: Meng Sen <qyg2297248353@gmail.com>
Date: Fri, 28 Feb 2025 10:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E6=B5=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Meng Sen <qyg2297248353@gmail.com>
---
 .github/renovate.json | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index b5f729c4..90de7b7a 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -4,8 +4,10 @@
     "config:recommended"
   ],
   "forkProcessing": "enabled",
-  "rebaseWhen": "never",
+  "rebaseWhen": "conflicted",
   "prConcurrentLimit": 20,
+  "automerge": true,
+  "automergeType": "pr",
   "enabledManagers": [
     "docker-compose",
     "github-actions"
@@ -22,44 +24,19 @@
     "**/dify/**",
     "**/auto-lady/**"
   ],
-  "automerge": true,
   "packageRules": [
     {
       "matchUpdateTypes": [
-        "patch"
+        "patch",
+        "minor"
       ],
-      "automerge": true,
-      "automergeType": "pr"
+      "automerge": true
     },
     {
       "matchFileNames": [
         "apps/postgresql/pg*/*.yml"
       ],
-      "allowedVersions": "/^pg12*/"
-    },
-    {
-      "matchFileNames": [
-        "apps/postgresql/pg*/*.yml"
-      ],
-      "allowedVersions": "/^pg13*/"
-    },
-    {
-      "matchFileNames": [
-        "apps/postgresql/pg*/*.yml"
-      ],
-      "allowedVersions": "/^pg14*/"
-    },
-    {
-      "matchFileNames": [
-        "apps/postgresql/pg*/*.yml"
-      ],
-      "allowedVersions": "/^pg15*/"
-    },
-    {
-      "matchFileNames": [
-        "apps/postgresql/pg*/*.yml"
-      ],
-      "allowedVersions": "/^pg16*/"
+      "allowedVersions": "/^pg(12|13|14|15|16)*/"
     },
     {
       "matchFileNames": [