Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions .github/workflows/ci-tests-e2e-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Description: Runs E2E tests for release PRs after i18n workflow completes
name: 'CI: Tests E2E (Release PRs)'

on:
workflow_run:
workflows: ['i18n: Update Core']
types: [completed]
Comment on lines +5 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be added as a trigger to the existing e2e workflow?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no not really, that workflow already has enough triggers


jobs:
check-eligibility:
runs-on: ubuntu-latest
# Only run if:
# 1. This is the main repository
# 2. The i18n workflow was triggered by a pull_request
# 3. The i18n workflow completed successfully or was skipped (no locale changes)
# 4. The branch is a version-bump branch
# 5. The PR is from the main repo (not a fork)
if: |
github.repository == 'Comfy-Org/ComfyUI_frontend' &&
github.event.workflow_run.event == 'pull_request' &&
(github.event.workflow_run.conclusion == 'success' || github.event.workflow_run.conclusion == 'skipped') &&
startsWith(github.event.workflow_run.head_branch, 'version-bump-') &&
github.event.workflow_run.head_repository.full_name == github.event.workflow_run.repository.full_name
outputs:
pr_number: ${{ steps.pr.outputs.result }}
head_sha: ${{ github.event.workflow_run.head_sha }}
steps:
- name: Log workflow trigger info
run: |
echo "Repository: ${{ github.repository }}"
echo "Event: ${{ github.event.workflow_run.event }}"
echo "Conclusion: ${{ github.event.workflow_run.conclusion }}"
echo "Head branch: ${{ github.event.workflow_run.head_branch }}"
echo "Head SHA: ${{ github.event.workflow_run.head_sha }}"
echo "Head repo: ${{ github.event.workflow_run.head_repository.full_name }}"

- name: Get PR Number
id: pr
uses: actions/github-script@v7
with:
script: |
const { data: prs } = await github.rest.pulls.list({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
});

const pr = prs.find(p => p.head.sha === context.payload.workflow_run.head_sha);

if (!pr) {
console.log('No PR found for SHA:', context.payload.workflow_run.head_sha);
return null;
}
Comment on lines +42 to +53
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Potential pagination issue with pulls.list API.

The pulls.list call uses default pagination (30 PRs per page). If there are more than 30 open PRs, the version-bump PR might not be found, causing E2E tests to silently skip.

Consider increasing per_page or using pagination:

🔧 Suggested fix
 const { data: prs } = await github.rest.pulls.list({
   owner: context.repo.owner,
   repo: context.repo.repo,
   state: 'open',
+  per_page: 100,
 });
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const { data: prs } = await github.rest.pulls.list({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
});
const pr = prs.find(p => p.head.sha === context.payload.workflow_run.head_sha);
if (!pr) {
console.log('No PR found for SHA:', context.payload.workflow_run.head_sha);
return null;
}
const { data: prs } = await github.rest.pulls.list({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
per_page: 100,
});
const pr = prs.find(p => p.head.sha === context.payload.workflow_run.head_sha);
if (!pr) {
console.log('No PR found for SHA:', context.payload.workflow_run.head_sha);
return null;
}
🤖 Prompt for AI Agents
In @.github/workflows/ci-tests-e2e-release.yaml around lines 42 - 53, The
pulls.list call may miss the target PR due to default pagination; update the
code that calls github.rest.pulls.list (and the subsequent pr lookup using
pr.head.sha and context.payload.workflow_run.head_sha) to fetch all open PRs by
either adding a larger per_page (e.g., per_page: 100) or switching to pagination
(e.g., use github.paginate or octokit.paginate over github.rest.pulls.list) so
the prs array contains every open PR before running prs.find; ensure the ref
remains the same (pr variable and head.sha comparison) after changing the fetch
logic.


console.log(`Found PR #${pr.number} for version bump: ${context.payload.workflow_run.head_branch}`);
return pr.number;

run-e2e-tests:
needs: check-eligibility
if: needs.check-eligibility.outputs.pr_number != 'null'
uses: ./.github/workflows/ci-tests-e2e.yaml
with:
ref: ${{ needs.check-eligibility.outputs.head_sha }}
pr_number: ${{ needs.check-eligibility.outputs.pr_number }}
secrets: inherit
50 changes: 42 additions & 8 deletions .github/workflows/ci-tests-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,35 @@ on:
pull_request:
branches-ignore:
[wip/*, draft/*, temp/*, vue-nodes-migration, sno-playwright-*]
workflow_call:
inputs:
ref:
description: 'Git ref to checkout'
required: true
type: string
pr_number:
description: 'PR number for commenting'
required: false
type: string

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.workflow }}-${{ inputs.ref || github.ref }}
cancel-in-progress: true

jobs:
setup:
runs-on: ubuntu-latest
# Skip version-bump PRs on pull_request trigger (they use ci-tests-e2e-release.yaml)
# Always run for push, workflow_call, or non-version-bump PRs
if: |
github.event_name == 'push' ||
github.event_name == 'workflow_call' ||
!startsWith(github.head_ref, 'version-bump-')
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: ${{ inputs.ref || '' }}
- name: Setup frontend
uses: ./.github/actions/setup-frontend
with:
Expand Down Expand Up @@ -52,6 +70,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: ${{ inputs.ref || '' }}
- name: Download built frontend
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -99,6 +119,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: ${{ inputs.ref || '' }}
- name: Download built frontend
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -143,6 +165,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: ${{ inputs.ref || '' }}

- name: Install pnpm
uses: pnpm/action-setup@v4
Expand Down Expand Up @@ -178,12 +202,16 @@ jobs:
# Post starting comment for non-forked PRs
comment-on-pr-start:
runs-on: ubuntu-latest
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
if: |
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) ||
(github.event_name == 'workflow_call' && inputs.pr_number != '')
permissions:
pull-requests: write
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: ${{ inputs.ref || '' }}

- name: Get start time
id: start-time
Expand All @@ -195,22 +223,28 @@ jobs:
run: |
chmod +x scripts/cicd/pr-playwright-deploy-and-comment.sh
./scripts/cicd/pr-playwright-deploy-and-comment.sh \
"${{ github.event.pull_request.number }}" \
"${{ github.head_ref }}" \
"${{ inputs.pr_number || github.event.pull_request.number }}" \
"${{ github.head_ref || inputs.ref }}" \
"starting" \
"${{ steps.start-time.outputs.time }}"

# Deploy and comment for non-forked PRs only
deploy-and-comment:
needs: [playwright-tests, merge-reports]
runs-on: ubuntu-latest
if: always() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
if: |
always() && (
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) ||
(github.event_name == 'workflow_call' && inputs.pr_number != '')
)
permissions:
pull-requests: write
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: ${{ inputs.ref || '' }}

- name: Download all playwright reports
uses: actions/download-artifact@v4
Expand All @@ -223,10 +257,10 @@ jobs:
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
GITHUB_SHA: ${{ inputs.ref || github.event.pull_request.head.sha }}
run: |
bash ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
"${{ github.event.pull_request.number }}" \
"${{ github.head_ref }}" \
"${{ inputs.pr_number || github.event.pull_request.number }}" \
"${{ github.head_ref || inputs.ref }}" \
"completed"
#### END Deployment and commenting (non-forked PRs only)