From 84b16d127fd059582fdfef5e8211de4d684f1fd0 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Sun, 10 Sep 2023 23:13:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=20renovate=20action?=
 =?UTF-8?q?=20=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/renovate-app-version.yml | 2 +-
 renovate.json                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/renovate-app-version.yml b/.github/workflows/renovate-app-version.yml
index f7c36581..1e5ebbb2 100644
--- a/.github/workflows/renovate-app-version.yml
+++ b/.github/workflows/renovate-app-version.yml
@@ -47,7 +47,7 @@ jobs:
           for file in "${files[@]}"; do
             if [[ $file == *"docker-compose.yml"* ]]; then
               app_name=$(echo $file | cut -d'/' -f 2)
-              git add "apps/$app_name/*" && git commit -m "Update app version" --no-verify && git push || true
+              git add "apps/$app_name/*" && git commit -m "Update app version [skip ci]" --no-verify && git push || true
             fi
           done
 
diff --git a/renovate.json b/renovate.json
index e34be91d..6ed5339e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,6 +4,7 @@
   "gitIgnoredAuthors": [
     "githubaction@githubaction.com"
   ],
+  "rebaseWhen": "never",
   "packageRules": [
     {
       "packageNames": ["docker-compose"],