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 系统健康检查 +- 负责人:待分配 +- 状态:规划中 +- 技术栈:待定 +- 依赖模块:无