From 90883a87ab99aef4c4d7f38c8d4ea6863e6596f2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 7 Mar 2026 09:54:24 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=8A=20=E5=86=B0=E6=9C=94=E4=BA=BA?=
 =?UTF-8?q?=E6=A0=BC=E4=BD=93=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E9=98=BB=E5=A1=9E=20=C2=B7=20=E7=A7=BB=E9=99=A4=E5=9D=8F=20sub?=
 =?UTF-8?q?module=20+=20=E7=AB=9E=E6=80=81=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20+=20rsync=20=E4=BF=9D=E9=9A=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
---
 .github/workflows/deploy-to-server.yml    | 7 +++++++
 .github/workflows/generate-module-doc.yml | 7 ++++++-
 .github/workflows/update-repo-map.yml     | 8 +++++++-
 m18-health-check                          | 1 -
 m18-health-check/README.md                | 5 +++++
 5 files changed, 25 insertions(+), 3 deletions(-)
 delete mode 160000 m18-health-check
 create mode 100644 m18-health-check/README.md

diff --git a/.github/workflows/deploy-to-server.yml b/.github/workflows/deploy-to-server.yml
index 1f05b654..06b50f4e 100644
--- a/.github/workflows/deploy-to-server.yml
+++ b/.github/workflows/deploy-to-server.yml
@@ -89,6 +89,13 @@ jobs:
       - name: 📥 检出代码
         uses: actions/checkout@v4
 
+      - name: 📦 确保 rsync 已安装
+        run: |
+          if ! command -v rsync &>/dev/null; then
+            sudo apt-get update -qq && sudo apt-get install -y rsync
+          fi
+          rsync --version | head -1
+
       - name: 🔑 配置 SSH 连接
         run: |
           mkdir -p ~/.ssh
diff --git a/.github/workflows/generate-module-doc.yml b/.github/workflows/generate-module-doc.yml
index e8de5d9e..15017793 100644
--- a/.github/workflows/generate-module-doc.yml
+++ b/.github/workflows/generate-module-doc.yml
@@ -49,7 +49,12 @@ jobs:
             echo "📋 文档无变化，跳过提交"
           else
             git commit -m "📋 自动更新 HoloLake Era 模块文档 · $(date -u +%Y-%m-%d\ %H:%M\ UTC)"
-            git push
+            git pull --rebase origin main || true
+            git push || {
+              echo "⚠️ 推送失败，尝试重新拉取后再推送..."
+              git pull --rebase origin main
+              git push
+            }
           fi
 
   notify-collaborator:
diff --git a/.github/workflows/update-repo-map.yml b/.github/workflows/update-repo-map.yml
index f2469e5a..fb1cb32b 100644
--- a/.github/workflows/update-repo-map.yml
+++ b/.github/workflows/update-repo-map.yml
@@ -34,4 +34,10 @@ jobs:
           git config user.email "zhuyuan@guanghulab.com"
           git add .github/brain/repo-map.json .github/brain/repo-snapshot.md
           git diff --cached --quiet || git commit -m "📚 铸渊图书馆目录更新 · $(date +%Y-%m-%dT%H:%M)"
-          git push
+          # 拉取远端最新更改后再推送，避免竞态条件
+          git pull --rebase origin main || true
+          git push || {
+            echo "⚠️ 推送失败，尝试重新拉取后再推送..."
+            git pull --rebase origin main
+            git push
+          }
diff --git a/m18-health-check b/m18-health-check
deleted file mode 160000
index 4c5dc4e8..00000000
--- a/m18-health-check
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4c5dc4e8be2bcba1acee37c1bf93e18372ae4795
diff --git a/m18-health-check/README.md b/m18-health-check/README.md
new file mode 100644
index 00000000..857abf66
--- /dev/null
+++ b/m18-health-check/README.md
@@ -0,0 +1,5 @@
+# M18 系统健康检查
+- 负责人：待分配
+- 状态：规划中
+- 技术栈：待定
+- 依赖模块：无