From 059855c6e807b0e70665a7495ee275a74bbaac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3-coder?= Date: Thu, 20 Nov 2025 22:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E7=BB=9C=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E5=92=8C=E9=87=8D=E8=AF=95=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 sync_repos.py 中添加Git fetch重试机制（最多3次） - 优化错误处理和超时管理 - 在 workflow中添加网络连通性诊断步骤 - 提供更详细的错误诊断信息 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .gitea/workflows/multi-repo-sync.yml | 31 ++++++++++++++++++++++++ sync_repos.py | 36 ++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/multi-repo-sync.yml b/.gitea/workflows/multi-repo-sync.yml index 0b1712d..1413231 100644 --- a/.gitea/workflows/multi-repo-sync.yml +++ b/.gitea/workflows/multi-repo-sync.yml @@ -44,6 +44,37 @@ jobs: fi echo "✓ 配置文件已找到" + - name: 网络连通性诊断 + run: | + echo "================================================================================" + echo "网络连通性诊断" + echo "================================================================================" + echo "" + echo "[1] 检查DNS解析 (center.javablade.com):" + if command -v nslookup >/dev/null 2>&1; then + nslookup center.javablade.com || echo "❌ nslookup 失败" + elif command -v dig >/dev/null 2>&1; then + dig center.javablade.com || echo "❌ dig 失败" + else + getent hosts center.javablade.com || echo "❌ DNS 解析失败" + fi + echo "" + echo "[2] 检查网络连通性:" + if command -v ping >/dev/null 2>&1; then + ping -c 3 -W 5 center.javablade.com || echo "❌ ping 失败" + else + echo "⚠️ ping 命令不可用，跳过连通性测试" + fi + echo "" + echo "[3] 检查是否可以访问上游仓库（匿名测试）:" + if command -v git >/dev/null 2>&1; then + timeout 30 git ls-remote https://center.javablade.com/blade/BladeX-Tool.git HEAD || echo "❌ 无法访问仓库" + else + echo "⚠️ git 命令不可用" + fi + echo "" + echo "================================================================================" + - name: 从配置文件中提取仓库并同步 env: UPSTREAM_USERNAME: ${{ secrets.UPSTREAM_USERNAME }} diff --git a/sync_repos.py b/sync_repos.py index ad792c7..689ed20 100644 --- a/sync_repos.py +++ b/sync_repos.py @@ -56,13 +56,35 @@ def sync_repository(repo_config): return False # 获取上游更改 print(f"[3/6] 获取上游更改...") - result = subprocess.run( - ['git', 'fetch', 'upstream'], - capture_output=True, text=True, timeout=600 - ) - if result.returncode != 0: - print(f"❌ 获取上游更改失败:") - print(result.stderr) + max_retries = 3 + for attempt in range(1, max_retries + 1): + try: + result = subprocess.run( + ['git', 'fetch', 'upstream'], + capture_output=True, text=True, timeout=200 + ) + if result.returncode == 0: + break + print(f"❌ 获取上游更改失败 (尝试 {attempt}/{max_retries}):") + print(result.stderr) + except subprocess.TimeoutExpired: + print(f"❌ 获取上游更改超时 (尝试 {attempt}/{max_retries})，200秒限制") + + if attempt < max_retries: + print(f"⏳ 等待5秒后重试...") + time.sleep(5) + else: + # 所有尝试都失败 + print(f"\n网络诊断信息:") + print(f"- 错误类型: DNS解析或网络连接失败") + print(f"- 可能原因:") + print(f" 1. Gitea Actions Runner的DNS配置问题") + print(f" 2. Runner容器无法访问外部网络") + print(f" 3. 上游仓库服务器防火墙限制") + print(f"- 解决方案:") + print(f" 1. 在workflow中添加hosts配置") + print(f" 2. 检查Runner的网络设置") + print(f" 3. 使用IP地址替代域名") return False # 检查目标分支是否存在 print(f"[4/6] 检查分支...")