Skip to content

B
bit-pm
Unverified 提交 0e6404c9 authored 作者: Will Chen's avatar Will Chen 提交者： GitHub
浏览文件
操作

Use workflow_dispatch to re-trigger CI instead of closing/reopening PR (#2382)

## Summary Replace the PR close/reopen mechanism for CI re-triggering with GitHub's `workflow_dispatch` event, which is more reliable and avoids potential issues with PR state management. ## Key Changes - **ci.yml**: Added `workflow_dispatch` trigger with optional `pr_number` input parameter to allow manual CI runs - **ci.yml**: Updated test check logic to always run tests when triggered via `workflow_dispatch` - **ci.yml**: Pass `PR_NUMBER` environment variable to Playwright summary script for workflow_dispatch triggers - **pr-review-responder.yml**: Replaced PR close/reopen logic with `gh workflow run` command to trigger CI via `workflow_dispatch` ## Implementation Details - The `workflow_dispatch` trigger accepts an optional `pr_number` input that can be passed by the pr-review-responder workflow - When CI is triggered via `workflow_dispatch`, tests always run (skipping the file change check) - The new approach is more reliable because: - Avoids the risk of leaving a PR in a closed state if operations fail - Works with `GITHUB_TOKEN` without infinite loop concerns - Provides explicit control over when CI re-runs - Eliminates retry logic and recovery mechanisms needed with close/reopen approach https://claude.ai/code/session_014TKdhebC3RqZ7yusKuRSJD <!-- devin-review-badge-begin --> --- <a href="https://app.devin.ai/review/dyad-sh/dyad/pull/2382"> <picture> <source media="(prefers-color-scheme: dark)" srcset="https://static.devin.ai/assets/gh-open-in-devin-review-dark.svg?v=1"> <img src="https://static.devin.ai/assets/gh-open-in-devin-review-light.svg?v=1" alt="Open with Devin"> </picture> </a> <!-- devin-review-badge-end --> <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Medium risk because it changes GitHub Actions triggering, concurrency grouping, and checkout behavior (including fork PR handling) for CI and AI review bots; misconfiguration could lead to running workflows on the wrong ref or not running at all. > > **Overview** > Switches CI and AI-bot workflows to support manual `workflow_dispatch` runs via a required `pr_number`, enabling reliable re-triggers without PR close/reopen. > > `ci.yml` now derives checkout `repository`/`ref` from the PR head (fetched via `gh pr view` for dispatch), updates concurrency grouping to key by PR number, always runs tests for dispatch runs, and passes `PR_NUMBER` to the Playwright summary script so comments still attach to the correct PR. > > `pr-review-responder.yml` replaces the close/reopen hack with `gh workflow run` calls to dispatch `ci.yml`, `bugbot-trigger.yml`, and `claude-pr-review.yml` when Claude pushes commits. `bugbot-trigger.yml` and `claude-pr-review.yml` add dispatch support and PR-number fallbacks; BugBot additionally validates `pr_number` and re-checks skip tags before commenting. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 357dddba6b3c3c9144b21f6f400fc0b49e55e244. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> <!-- This is an auto-generated description by cubic. --> --- ## Summary by cubic Switch re-triggers to workflow_dispatch for CI, BugBot, and Claude PR Review. This replaces the close/reopen hack, works with GITHUB_TOKEN, and ensures tests and reviews run after automated commits. - **Refactors** - Added workflow_dispatch with pr_number input to ci.yml, bugbot-trigger.yml, and claude-pr-review.yml. - pr-review-responder now calls gh workflow run for all three when it pushes commits. - CI always runs tests on workflow_dispatch, checks out the PR head (supports forks), passes PR_NUMBER to the Playwright summary, and uses pr_number in concurrency. - Claude PR Review fetches PR head info on dispatch; concurrency keys use pr_number when provided. - BugBot dispatch uses inputs.pr_number, re-checks skip tags, and bypasses author gating for dispatch. <sup>Written for commit 357dddba6b3c3c9144b21f6f400fc0b49e55e244. Summary will update on new commits.</sup> <!-- End of auto-generated description by cubic. --> --------- Co-authored-by: 's avatarClaude <noreply@anthropic.com>
上级 8a53b927
显示空白字符变更
内嵌 并排
正在显示 包含 130 行增加 和 22 行删除
.github/workflows/bugbot-trigger.yml
浏览文件 @ 0e6404c9
...@@ -3,25 +3,59 @@ name: BugBot Trigger ...@@ -3,25 +3,59 @@ name: BugBot Trigger
on: on:
pull_request_target: pull_request_target:
types: [opened, synchronize, ready_for_review, reopened] types: [opened, synchronize, ready_for_review, reopened]
workflow_dispatch:
inputs:
pr_number:
description: "PR number to trigger BugBot on (used by pr-review-responder)"
required: true
type: string
jobs: jobs:
trigger-bugbot: trigger-bugbot:
environment: ai-bots environment: ai-bots
# Only review code from regular contributors since bug bot has a capped # of PR reviews. # Only review code from regular contributors since bug bot has a capped # of PR reviews.
# For workflow_dispatch, we check skip tags below since the caller may not have validated them.
if: | if: |
(github.event.pull_request.user.login == 'wwwillchen' || github.event_name == 'workflow_dispatch' ||
((github.event.pull_request.user.login == 'wwwillchen' ||
github.event.pull_request.user.login == 'azizmejri1' || github.event.pull_request.user.login == 'azizmejri1' ||
github.event.pull_request.user.login == 'princeaden1') && github.event.pull_request.user.login == 'princeaden1') &&
!contains(github.event.pull_request.body, '#skip-bugbot') && !contains(github.event.pull_request.body, '#skip-bugbot') &&
!contains(github.event.pull_request.body, '#skip-bb') !contains(github.event.pull_request.body, '#skip-bb'))
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
pull-requests: write pull-requests: write
steps: steps:
- name: Validate pr_number format
if: github.event_name == 'workflow_dispatch'
run: |
if ! [[ "${{ inputs.pr_number }}" =~ ^[0-9]+$ ]]; then
echo "::error::pr_number must be a numeric value"
exit 1
fi
- name: Check skip tags for workflow_dispatch
if: github.event_name == 'workflow_dispatch'
id: check-skip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
PR_BODY=$(gh pr view "${{ inputs.pr_number }}" --repo "${{ github.repository }}" --json body --jq '.body') || {
echo "::error::Failed to fetch PR body for skip tag check"
exit 1
}
if echo "$PR_BODY" | grep -qE '#skip-bugbot|#skip-bb'; then
echo "skip=true" >> $GITHUB_OUTPUT
echo "Skipping BugBot: PR contains skip tag"
else
echo "skip=false" >> $GITHUB_OUTPUT
fi
- name: Comment @BugBot run - name: Comment @BugBot run
if: steps.check-skip.outputs.skip != 'true'
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5 uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
with: with:
# Use a PAT from wwwillchen to post on their behalf # Use a PAT from wwwillchen to post on their behalf
token: ${{ secrets.WWWILLCHEN_PR_RW_PAT }} token: ${{ secrets.WWWILLCHEN_PR_RW_PAT }}
issue-number: ${{ github.event.pull_request.number }} issue-number: ${{ github.event.pull_request.number || inputs.pr_number }}
body: "@BugBot run" body: "@BugBot run"
.github/workflows/ci.yml
浏览文件 @ 0e6404c9
...@@ -6,10 +6,17 @@ on: ...@@ -6,10 +6,17 @@ on:
- main - main
pull_request: pull_request:
types: [opened, synchronize, reopened, closed] types: [opened, synchronize, reopened, closed]
workflow_dispatch:
inputs:
pr_number:
description: "PR number for CI re-run (used by pr-review-responder)"
required: true
type: string
concurrency: concurrency:
# Use PR number for pull_request events to enable cancellation when PR is merged # Use PR number for pull_request/workflow_dispatch events to enable proper per-PR cancellation
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} # For workflow_dispatch, inputs.pr_number ensures different PRs don't cancel each other
group: ${{ github.workflow }}-${{ github.event.pull_request.number || inputs.pr_number || github.ref }}
cancel-in-progress: true cancel-in-progress: true
defaults: defaults:
...@@ -23,14 +30,38 @@ jobs: ...@@ -23,14 +30,38 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
should_run_tests: ${{ steps.check.outputs.should_run_tests }} should_run_tests: ${{ steps.check.outputs.should_run_tests }}
pr_head_ref: ${{ steps.pr-info.outputs.head_ref }}
pr_head_repo: ${{ steps.pr-info.outputs.head_repo }}
steps: steps:
- name: Get PR info for workflow_dispatch
if: github.event_name == 'workflow_dispatch' && inputs.pr_number != ''
id: pr-info
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
PR_DATA=$(gh pr view "${{ inputs.pr_number }}" --repo "${{ github.repository }}" --json headRefName,headRepository,headRepositoryOwner) || {
echo "::error::Failed to fetch PR info for PR #${{ inputs.pr_number }}"
exit 1
}
echo "head_ref=$(echo "$PR_DATA" | jq -r '.headRefName')" >> $GITHUB_OUTPUT
echo "head_repo=$(echo "$PR_DATA" | jq -r '.headRepositoryOwner.login + "/" + .headRepository.name')" >> $GITHUB_OUTPUT
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: ${{ steps.pr-info.outputs.head_repo || github.event.pull_request.head.repo.full_name || github.repository }}
ref: ${{ steps.pr-info.outputs.head_ref || github.event.pull_request.head.ref || '' }}
fetch-depth: 0 fetch-depth: 0
- name: Check if only .claude files changed - name: Check if only .claude files changed
id: check id: check
run: | run: |
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
# Always run tests for manual workflow dispatch (e.g., from pr-review-responder)
echo "should_run_tests=true" >> $GITHUB_OUTPUT
echo "Running tests: manual workflow dispatch"
exit 0
fi
if [ "${{ github.event_name }}" = "push" ] && [ "${{ github.ref }}" = "refs/heads/main" ]; then if [ "${{ github.event_name }}" = "push" ] && [ "${{ github.ref }}" = "refs/heads/main" ]; then
# Always run tests on pushes to main # Always run tests on pushes to main
echo "should_run_tests=true" >> $GITHUB_OUTPUT echo "should_run_tests=true" >> $GITHUB_OUTPUT
...@@ -95,6 +126,9 @@ jobs: ...@@ -95,6 +126,9 @@ jobs:
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
repository: ${{ needs.check-changes.outputs.pr_head_repo || github.event.pull_request.head.repo.full_name || github.repository }}
ref: ${{ needs.check-changes.outputs.pr_head_ref || github.event.pull_request.head.ref || '' }}
- name: Initialize environment - name: Initialize environment
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
...@@ -178,6 +212,9 @@ jobs: ...@@ -178,6 +212,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
repository: ${{ needs.check-changes.outputs.pr_head_repo || github.event.pull_request.head.repo.full_name || github.repository }}
ref: ${{ needs.check-changes.outputs.pr_head_ref || github.event.pull_request.head.ref || '' }}
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: lts/* node-version: lts/*
...@@ -222,6 +259,8 @@ jobs: ...@@ -222,6 +259,8 @@ jobs:
uses: actions/github-script@v7 uses: actions/github-script@v7
env: env:
PLAYWRIGHT_RUN_ID: ${{ github.run_id }} PLAYWRIGHT_RUN_ID: ${{ github.run_id }}
# Pass PR number for workflow_dispatch triggers (from pr-review-responder)
PR_NUMBER: ${{ inputs.pr_number }}
with: with:
script: | script: |
const { run } = require('./scripts/generate-playwright-summary.js'); const { run } = require('./scripts/generate-playwright-summary.js');
......
.github/workflows/claude-pr-review.yml
浏览文件 @ 0e6404c9
...@@ -5,9 +5,15 @@ name: Claude PR Review ...@@ -5,9 +5,15 @@ name: Claude PR Review
on: on:
pull_request_target: pull_request_target:
types: [opened, synchronize, ready_for_review, reopened] types: [opened, synchronize, ready_for_review, reopened]
workflow_dispatch:
inputs:
pr_number:
description: "PR number to review (used by pr-review-responder)"
required: true
type: string
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} group: ${{ github.workflow }}-${{ github.event.pull_request.number || inputs.pr_number }}
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
...@@ -17,8 +23,10 @@ jobs: ...@@ -17,8 +23,10 @@ jobs:
# Only review code from regular contributors since claude code has non-trivial costs. # Only review code from regular contributors since claude code has non-trivial costs.
# It's also a safe-guard for preventing malicious PRs from doing bad things although we restrict # It's also a safe-guard for preventing malicious PRs from doing bad things although we restrict
# the permissions and tools allowed in this job. # the permissions and tools allowed in this job.
# For workflow_dispatch, we trust the caller (pr-review-responder) has already validated.
# https://github.com/anthropics/claude-code-action/blob/main/examples/pr-review-filtered-authors.yml # https://github.com/anthropics/claude-code-action/blob/main/examples/pr-review-filtered-authors.yml
if: | if: |
github.event_name == 'workflow_dispatch' ||
github.event.pull_request.user.login == 'wwwillchen' || github.event.pull_request.user.login == 'wwwillchen' ||
github.event.pull_request.user.login == 'azizmejri1' || github.event.pull_request.user.login == 'azizmejri1' ||
github.event.pull_request.user.login == 'princeaden1' github.event.pull_request.user.login == 'princeaden1'
...@@ -27,11 +35,24 @@ jobs: ...@@ -27,11 +35,24 @@ jobs:
contents: read contents: read
pull-requests: write pull-requests: write
steps: steps:
- name: Get PR info for workflow_dispatch
if: github.event_name == 'workflow_dispatch'
id: pr-info
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
PR_DATA=$(gh pr view "${{ inputs.pr_number }}" --repo "${{ github.repository }}" --json headRefName,headRepository,headRepositoryOwner) || {
echo "::error::Failed to fetch PR info for PR #${{ inputs.pr_number }}"
exit 1
}
echo "head_ref=$(echo "$PR_DATA" | jq -r '.headRefName')" >> $GITHUB_OUTPUT
echo "head_repo=$(echo "$PR_DATA" | jq -r '.headRepositoryOwner.login + "/" + .headRepository.name')" >> $GITHUB_OUTPUT
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v5 uses: actions/checkout@v5
with: with:
repository: ${{ github.event.pull_request.head.repo.full_name }} repository: ${{ github.event.pull_request.head.repo.full_name || steps.pr-info.outputs.head_repo }}
ref: ${{ github.event.pull_request.head.ref }} ref: ${{ github.event.pull_request.head.ref || steps.pr-info.outputs.head_ref }}
fetch-depth: 1 fetch-depth: 1
- name: PR Review - name: PR Review
...@@ -52,7 +73,7 @@ jobs: ...@@ -52,7 +73,7 @@ jobs:
track_progress: false track_progress: false
prompt: | prompt: |
/dyad:multi-pr-review ${{ github.event.pull_request.number }} /dyad:multi-pr-review ${{ github.event.pull_request.number || inputs.pr_number }}
# Uses .claude/settings.json for permissions; only add MCP tool not in settings # Uses .claude/settings.json for permissions; only add MCP tool not in settings
claude_args: | claude_args: |
......
.github/workflows/pr-review-responder.yml
浏览文件 @ 0e6404c9
...@@ -118,7 +118,7 @@ jobs: ...@@ -118,7 +118,7 @@ jobs:
prompt: | prompt: |
/dyad:pr-fix ${{ steps.pr-info.outputs.pr_number }} /dyad:pr-fix ${{ steps.pr-info.outputs.pr_number }}
- name: Re-trigger CI if commits were pushed - name: Re-trigger workflows if commits were pushed
# Use always() to ensure commits get tested even if Claude Code fails partway through # Use always() to ensure commits get tested even if Claude Code fails partway through
if: steps.pr-info.outputs.should_continue == 'true' && always() if: steps.pr-info.outputs.should_continue == 'true' && always()
env: env:
...@@ -135,19 +135,33 @@ jobs: ...@@ -135,19 +135,33 @@ jobs:
if [ "${{ steps.before-claude.outputs.sha }}" != "$PR_HEAD_SHA" ]; then if [ "${{ steps.before-claude.outputs.sha }}" != "$PR_HEAD_SHA" ]; then
echo "Claude pushed new commits (before: ${{ steps.before-claude.outputs.sha }}, after: $PR_HEAD_SHA)" echo "Claude pushed new commits (before: ${{ steps.before-claude.outputs.sha }}, after: $PR_HEAD_SHA)"
echo "Re-triggering CI by closing and reopening PR" echo "Re-triggering workflows via workflow_dispatch"
if gh pr close ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }}; then # Use workflow_dispatch to trigger workflows - this works with GITHUB_TOKEN unlike PR events
if ! gh pr reopen ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }}; then # which are blocked to prevent infinite loops
echo "::warning::Failed to reopen PR after close. Attempting recovery..." #
# Retry reopen once after a short delay # Note: We use the default branch (no --ref) instead of head_branch because for fork PRs,
sleep 2 # head_branch only exists in the fork repo, not the main repo. The workflows will checkout
gh pr reopen ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }} || echo "::error::PR may be left closed. Manual intervention required." # the correct PR code using the pr_number input.
fi
else # Trigger CI
echo "::warning::Failed to close PR, skipping re-trigger" gh workflow run ci.yml \
fi --repo ${{ github.repository }} \
-f pr_number=${{ steps.pr-info.outputs.pr_number }} \
|| echo "::warning::Failed to trigger CI workflow"
# Trigger BugBot
gh workflow run bugbot-trigger.yml \
--repo ${{ github.repository }} \
-f pr_number=${{ steps.pr-info.outputs.pr_number }} \
|| echo "::warning::Failed to trigger BugBot workflow"
# Trigger Claude PR Review
gh workflow run claude-pr-review.yml \
--repo ${{ github.repository }} \
-f pr_number=${{ steps.pr-info.outputs.pr_number }} \
|| echo "::warning::Failed to trigger Claude PR Review workflow"
else else
echo "No new commits pushed, skipping CI re-trigger" echo "No new commits pushed, skipping workflow re-triggers"
fi fi
- name: Update labels to done - name: Update labels to done
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论