fix(ci): auto-fix checkout加--force + black格式对齐

2026-07-20 13:16:54 +08:00
parent 3772b13c81
commit 970e640c15
1 changed files with 6 additions and 3 deletions
@@ -61,7 +61,8 @@ def ensure_git_repo(api_url, repo, token, pr_number):
    # 强制checkout到源分支（覆盖tarball内容）
    # tarball是merge后的commit，源分支才是我们要修改并推送的目标
    print("切换到源分支...")
-    run(f"git checkout -B {head_branch} FETCH_HEAD")
+    # --force 覆盖tarball留下的untracked文件，避免"The following untracked working tree files would be overwritten"
+    run(f"git checkout -B --force {head_branch} FETCH_HEAD")

    result = run("git status --porcelain")
    if result.stdout.strip():
@@ -265,12 +266,14 @@ def main():
                print(f"推送失败: {push_result.stderr[-200:]}", file=sys.stderr)
                if attempt < max_push_retries:
                    import time
-                    time.sleep(2 ** attempt)
+
+                    time.sleep(2**attempt)
        except Exception as e:
            print(f"推送异常: {e}", file=sys.stderr)
            if attempt < max_push_retries:
                import time
-                time.sleep(2 ** attempt)
+
+                time.sleep(2**attempt)

    if not push_success:
        print("⚠️  自动格式化推送失败，跳过（请手动检查）", file=sys.stderr)