From 504e2e71c93cc913531129d0f6580a9fa4b76cac Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 16:21:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20auto=5Fmerge.sh=E6=94=B9=E7=94=A8CI?= =?UTF-8?q?=20Gate=E7=BB=9F=E4=B8=80=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/ci/auto_merge.sh | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/scripts/ci/auto_merge.sh b/scripts/ci/auto_merge.sh index d251b9820..acb8dcdef 100644 --- a/scripts/ci/auto_merge.sh +++ b/scripts/ci/auto_merge.sh @@ -23,23 +23,11 @@ FRONTEND_COUNT=$(echo "$FILES" | grep -c '^apps/web/' || true) BACKEND_COUNT=$((TOTAL - FRONTEND_COUNT)) echo "变更文件: ${TOTAL} 个 (前端: ${FRONTEND_COUNT}, 后端/公共: ${BACKEND_COUNT})" -if [ "$BACKEND_COUNT" = "0" ] && [ "$FRONTEND_COUNT" -gt "0" ]; then - CONTEXTS=("CI/CD Pipeline / Frontend Lint (pull_request)") - echo "纯前端改动,只检查Frontend Lint" -else - CONTEXTS=( - "CI/CD Pipeline / Validate - Code Quality (pull_request)" - "CI/CD Pipeline / Validate - Type Check (mypy) (pull_request)" - "CI/CD Pipeline / Validate - Migration (alembic) (pull_request)" - "CI/CD Pipeline / Frontend Lint (pull_request)" - "CI/CD Pipeline / Unit Tests (pull_request)" - "CI/CD Pipeline / Frontend Unit Tests (pull_request)" - "CI/CD Pipeline / PR Build API Image (pull_request)" - "CI/CD Pipeline / PR Build Web Image (pull_request)" - "CI/CD Pipeline / PR Build Worker Image (pull_request)" - ) - echo "检查required门禁(与分支保护一致)" -fi +# 使用统一的CI Gate门禁(单一检查点,自动处理前端/后端/全栈跳过逻辑) +CONTEXTS=( + "CI/CD Pipeline / CI Gate (pull_request)" +) +echo "检查CI Gate统一门禁" echo # 初始等待30秒,给CI启动写status的时间