From b8101406fb85f77e21b31f8a100550ff6e67a621 Mon Sep 17 00:00:00 2001 From: Yige Date: Wed, 13 May 2026 00:21:51 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=BC=95=E5=85=A5=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BF=9D=E6=8A=A4=E9=85=8D=E5=A5=97=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=EF=BC=88path=20=E8=BF=87=E6=BB=A4=20=E2=86=92=20detect-changes?= =?UTF-8?q?=EF=BC=8CAI=20review=20=E8=87=AA=E5=8A=A8=E5=8C=96=EF=BC=89=20(?= =?UTF-8?q?#5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary / 概要 为了让 `main` 分支保护规则在所有 PR 上稳定生效，调整两个现有 i18n workflow 并新增两个 AI review 配套 workflow。 ### 已配置的 main ruleset（ID 16298003） - 只允许 squash merge，禁止 force push / 删除 - 必需 status check：`validate`、`translate`，require `strict_required_status_checks_policy=true`（必须 rebase 最新） - PR rule：`required_approving_review_count=0`、`required_review_thread_resolution=true`、`dismiss_stale_reviews_on_push=true` - `bypass_actors=[]`：管理员也不能绕过 ### 本 PR 改动 1. **i18n-validate / i18n-translate**：移除 `on.pull_request.paths`，把过滤下移到 job 内 `detect-changes` step。路径不相关时跳过实际逻辑但 job 仍 success，避免 required check 因 path 过滤缺失而卡死非 i18n PR。 2. **auto-request-copilot-review** (新增)：PR opened/reopened/ready_for_review 时自动 `POST /pulls/{n}/requested_reviewers` 加 Copilot 为 reviewer。 3. **wait-for-copilot-review** (新增)：PR opened/reopened/synchronize/ready_for_review 时启动，轮询 reviews API 等待 `copilot-pull-request-reviewer[bot]` 在当前 head SHA 提交 review。超时 8 分钟则 fail。 - 选择 polling 而不是 `pull_request_review` 事件触发是因为：Copilot bot 触发的 `pull_request_review` 事件被 GitHub 视为 first-time contributor，workflow run 会卡在 `action_required` 状态需 maintainer 在 web UI 手动批准，无法自动化。 合并后会再 PATCH ruleset 16298003，把 `wait-for-copilot-review` 加入 required status checks 作为强制门槛。 ## Test plan - [x] `i18n-validate` 在本 PR 上跑出 success（PR 仅触及 `.github/workflows/`，relevant=false，走 skip 分支） - [x] `i18n-translate` 同上 - [x] `auto-request-copilot-review` 跑出 success，Copilot 被自动加为 reviewer - [x] `wait-for-copilot-review` 在 polling 窗口内捕获到 Copilot review 并 pass - [ ] 解决 Copilot 提的 conversations 后能 squash merge - [ ] 合并后用 PATCH ruleset 把 `wait-for-copilot-review` 加入 required checks --- .../workflows/auto-request-copilot-review.yml | 39 ++++++++++++ .github/workflows/i18n-translate.yml | 36 ++++++++--- .github/workflows/i18n-validate.yml | 60 ++++++++++++++----- .github/workflows/wait-for-copilot-review.yml | 43 +++++++++++++ 4 files changed, 155 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/auto-request-copilot-review.yml create mode 100644 .github/workflows/wait-for-copilot-review.yml diff --git a/.github/workflows/auto-request-copilot-review.yml b/.github/workflows/auto-request-copilot-review.yml new file mode 100644 index 0000000..6280b9d --- /dev/null +++ b/.github/workflows/auto-request-copilot-review.yml @@ -0,0 +1,39 @@ +name: Auto-request Copilot review + +on: + pull_request: + types: [opened, reopened, ready_for_review] + +permissions: + pull-requests: write + +jobs: + request: + if: github.event.pull_request.draft == false + runs-on: ubuntu-latest + timeout-minutes: 2 + steps: + - name: Request Copilot reviewer + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + set -e + if gh api "repos/${{ github.repository }}/pulls/$PR_NUMBER" \ + --jq '.requested_reviewers[].login' \ + | grep -qE '^(Copilot|copilot-pull-request-reviewer\[bot\])$'; then + echo "Copilot already requested as reviewer." + exit 0 + fi + # 422 here usually means Copilot has already submitted a review (so the + # request slot is gone). Treat that as benign. + if ! resp=$(gh api -X POST \ + "repos/${{ github.repository }}/pulls/$PR_NUMBER/requested_reviewers" \ + -f 'reviewers[]=copilot-pull-request-reviewer[bot]' 2>&1); then + echo "$resp" + if echo "$resp" | grep -q '"status":"422"'; then + echo "POST returned 422; Copilot likely already reviewed." + exit 0 + fi + exit 1 + fi diff --git a/.github/workflows/i18n-translate.yml b/.github/workflows/i18n-translate.yml index 9f5d15b..dada687 100644 --- a/.github/workflows/i18n-translate.yml +++ b/.github/workflows/i18n-translate.yml @@ -12,11 +12,6 @@ name: i18n Auto-Translate on: pull_request: - paths: - - "skills/**/SKILL.zh-CN.md" - - "skills/**/SKILL.md" - - "manifest.json" - - "categories.json" workflow_dispatch: inputs: target_locale: @@ -49,11 +44,32 @@ jobs: token: ${{ secrets.DESIRECORE_BOT_TOKEN || secrets.GITHUB_TOKEN }} fetch-depth: 0 + - name: Detect relevant changes + id: changes + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }} + run: | + set -e + if [ "${{ github.event_name }}" != "pull_request" ]; then + echo "relevant=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + git fetch --no-tags --depth=1 origin "$BASE_SHA" 2>/dev/null || true + changed=$(git diff --name-only "${BASE_SHA}...${HEAD_SHA}" || true) + if echo "$changed" | grep -qE '^(skills/.+/SKILL(\.zh-CN)?\.md$|manifest\.json$|categories\.json$)'; then + echo "relevant=true" >> "$GITHUB_OUTPUT" + else + echo "relevant=false" >> "$GITHUB_OUTPUT" + fi + - name: Install uv + if: steps.changes.outputs.relevant == 'true' uses: astral-sh/setup-uv@v3 - name: Check for stale translations id: precheck + if: steps.changes.outputs.relevant == 'true' run: | set +e uv run --quiet scripts/i18n/translate.py --check @@ -66,7 +82,7 @@ jobs: exit 0 - name: Translate stale locales - if: steps.precheck.outputs.stale == 'true' + if: steps.changes.outputs.relevant == 'true' && steps.precheck.outputs.stale == 'true' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }} @@ -84,12 +100,12 @@ jobs: uv run --quiet scripts/i18n/translate.py "${ARGS[@]}" - name: Validate after translation - if: steps.precheck.outputs.stale == 'true' + if: steps.changes.outputs.relevant == 'true' && steps.precheck.outputs.stale == 'true' run: uv run --quiet scripts/i18n/validate-i18n.py - name: Detect changes id: diff - if: steps.precheck.outputs.stale == 'true' + if: steps.changes.outputs.relevant == 'true' && steps.precheck.outputs.stale == 'true' run: | if git diff --quiet; then echo "changed=false" >> "$GITHUB_OUTPUT" @@ -154,3 +170,7 @@ jobs: issue_number: context.issue.number, labels: ['i18n-translation-failed'], }); + + - name: Skip notice + if: steps.changes.outputs.relevant != 'true' + run: echo "No i18n-relevant changes; translation skipped." diff --git a/.github/workflows/i18n-validate.yml b/.github/workflows/i18n-validate.yml index 9f91f1f..5b44701 100644 --- a/.github/workflows/i18n-validate.yml +++ b/.github/workflows/i18n-validate.yml @@ -2,20 +2,8 @@ name: i18n Validate on: pull_request: - paths: - - "skills/**" - - "agents/**" - - "manifest.json" - - "categories.json" - - "scripts/i18n/**" push: branches: [main] - paths: - - "skills/**" - - "agents/**" - - "manifest.json" - - "categories.json" - - "scripts/i18n/**" workflow_dispatch: permissions: @@ -27,16 +15,58 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Detect relevant changes + id: changes + env: + EVENT_NAME: ${{ github.event_name }} + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }} + PUSH_BEFORE: ${{ github.event.before }} + PUSH_AFTER: ${{ github.event.after }} + run: | + set -e + case "$EVENT_NAME" in + pull_request) + git fetch --no-tags --depth=1 origin "$BASE_SHA" 2>/dev/null || true + range="${BASE_SHA}...${HEAD_SHA}" + ;; + push) + if [ -n "$PUSH_BEFORE" ] && [ "$PUSH_BEFORE" != "0000000000000000000000000000000000000000" ]; then + range="${PUSH_BEFORE}...${PUSH_AFTER}" + else + # initial push or unknown before — assume relevant + echo "relevant=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + ;; + *) + echo "relevant=true" >> "$GITHUB_OUTPUT" + exit 0 + ;; + esac + changed=$(git diff --name-only "$range" || true) + if echo "$changed" | grep -qE '^(skills/|agents/|manifest\.json$|categories\.json$|scripts/i18n/)'; then + echo "relevant=true" >> "$GITHUB_OUTPUT" + else + echo "relevant=false" >> "$GITHUB_OUTPUT" + fi - name: Install uv + if: steps.changes.outputs.relevant == 'true' uses: astral-sh/setup-uv@v3 - name: Validate i18n + if: steps.changes.outputs.relevant == 'true' run: uv run --quiet scripts/i18n/validate-i18n.py - name: Check for stale translations + if: steps.changes.outputs.relevant == 'true' run: uv run --quiet scripts/i18n/translate.py --check - # --check exits 1 when any locale needs translation. We don't fail the - # PR — translate.py (the i18n-translate workflow) will fix it. We just - # surface the report. continue-on-error: true + + - name: Skip notice + if: steps.changes.outputs.relevant != 'true' + run: echo "No i18n-relevant changes; validation skipped." diff --git a/.github/workflows/wait-for-copilot-review.yml b/.github/workflows/wait-for-copilot-review.yml new file mode 100644 index 0000000..2cc613c --- /dev/null +++ b/.github/workflows/wait-for-copilot-review.yml @@ -0,0 +1,43 @@ +name: Wait for Copilot review + +on: + pull_request: + types: [opened, reopened, synchronize, ready_for_review] + +permissions: + pull-requests: read + +jobs: + wait-for-copilot-review: + if: github.event.pull_request.draft == false + runs-on: ubuntu-latest + timeout-minutes: 10 + steps: + - name: Wait for Copilot to review the head commit + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_NUMBER: ${{ github.event.pull_request.number }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + run: | + set -e + # Poll up to ~8 minutes for Copilot to submit a review on the current head. + for i in $(seq 1 48); do + reviews=$(gh api --paginate "repos/${{ github.repository }}/pulls/$PR_NUMBER/reviews") + matching=$(echo "$reviews" | jq -r --arg sha "$HEAD_SHA" ' + [ .[] | select( + ((.user.login == "Copilot") or (.user.login == "copilot-pull-request-reviewer[bot]")) + and (.commit_id == $sha) + and (.state != "DISMISSED" and .state != "PENDING") + ) ] | length + ') + if [ "$matching" -gt 0 ]; then + echo "✓ Copilot has reviewed commit $HEAD_SHA ($matching review(s))" + exit 0 + fi + echo "Attempt $i/48: Copilot has not reviewed $HEAD_SHA yet — sleeping 10s." + sleep 10 + done + echo "✗ Timed out waiting for Copilot review on $HEAD_SHA." + echo "All reviews currently on this PR:" + echo "$reviews" | jq -r '.[] | " - \(.user.login) on \(((.commit_id // "?") | .[0:7])): \(.state)"' || true + exit 1