diff --git a/.github/workflows/generate-module-doc.yml b/.github/workflows/generate-module-doc.yml index 15017793..9c837b39 100644 --- a/.github/workflows/generate-module-doc.yml +++ b/.github/workflows/generate-module-doc.yml @@ -49,7 +49,7 @@ jobs: echo "📋 文档无变化,跳过提交" else git commit -m "📋 自动更新 HoloLake Era 模块文档 · $(date -u +%Y-%m-%d\ %H:%M\ UTC)" - git pull --rebase origin main || true + git pull --rebase origin main || echo "⚠️ rebase 失败(可能有冲突),尝试直接推送..." git push || { echo "⚠️ 推送失败,尝试重新拉取后再推送..." git pull --rebase origin main diff --git a/.github/workflows/update-repo-map.yml b/.github/workflows/update-repo-map.yml index fb1cb32b..b2104c70 100644 --- a/.github/workflows/update-repo-map.yml +++ b/.github/workflows/update-repo-map.yml @@ -35,7 +35,7 @@ jobs: 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 pull --rebase origin main || true + git pull --rebase origin main || echo "⚠️ rebase 失败(可能有冲突),尝试直接推送..." git push || { echo "⚠️ 推送失败,尝试重新拉取后再推送..." git pull --rebase origin main