diff --git a/.gitea/workflows/pr-automation.yml b/.gitea/workflows/pr-automation.yml index a2bff3f03..9013a9e07 100755 --- a/.gitea/workflows/pr-automation.yml +++ b/.gitea/workflows/pr-automation.yml @@ -72,7 +72,7 @@ jobs: sleep 30 # 轮询等待,最多20分钟(120次x10秒) - for attempt in $(seq 1 120); do + for attempt in $(seq 1 240); do ALL_SUCCESS=true ANY_FAILED=false ANY_PENDING=false @@ -173,7 +173,7 @@ jobs: done echo - echo "⏰ 等待超时(20分钟),CI尚未全部完成" + echo "⏰ 等待超时(40分钟),CI尚未全部完成" exit 0 - name: Report CI trace @@ -278,18 +278,13 @@ jobs: fi done - # 检查审批状态 - APPROVAL_RESULT=$(python3 scripts/check_pr_approval.py "$MERGE_TOKEN" "$GITHUB_REPOSITORY" "$PR_NUMBER" 1) - echo " 审批: $APPROVAL_RESULT" - HAS_APPROVAL=false - if echo "$APPROVAL_RESULT" | grep -q '^approved'; then - HAS_APPROVAL=true + # 分支保护required_approvals=0,无需审批检查,直接检查CI状态即可 fi - # 全部满足 → 合并 - if [ "$ALL_SUCCESS" = "true" ] && [ "$HAS_APPROVAL" = "true" ]; then + # CI全绿 → 合并 + if [ "$ALL_SUCCESS" = "true" ]; then echo - echo "CI全绿 + 审批通过,执行自动合并" + echo "CI全绿,执行自动合并" echo "等待60秒冷却,给Gitea内部状态同步时间..." sleep 60