xiaoxia/xiaoxia-saas

fix(ci): auto-fix push增加rebase+重试，修复Validate格式修复推送失败 #636

Merged

xiaoxia merged 1 commits from ci/fix-validate-black-format into develop

2026-07-20 13:36:23 +08:00

Author	SHA1	Message	Date
CI Bot	136546354b	fix(ci): auto-fix push增加rebase+重试，修复格式修复推送失败 PR Automation / Auto Approve on CI Green (pull_request) Successful in 8m1s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 8m0s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details Preview Deploy / Deploy Preview Environment (pull_request) Failing after 16s Details AI Code Review / AI Code Review (pull_request) Failing after 32s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 17s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 23s Details CI/CD Pipeline / Frontend Lint (pull_request) Successful in 8m7s Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 4m40s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 6m50s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m50s Details auto_fix_formatting.py 之前直接 git push 没有同步远端最新代码，当分支有新 commit 时 push 会因 non-fast-forward 失败，导致格式修复无法自动推送回 PR 分支，Validate 持续挂红。修复方案： - push 前先 git fetch + git rebase 同步远端最新代码 - 最多重试 3 次，每次间隔 2-3 秒 - rebase 冲突时自动 abort 并退出，避免死锁 - 失败时输出明确的错误信息从源头消除 Validate 因 auto-fix push 失败导致的反复挂红。	2026-07-20 12:55:19 +08:00