mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-29 18:52:19 +00:00
Revert "fix: run E2E tests after i18n completes on release PRs" (#8105)
Reverts Comfy-Org/ComfyUI_frontend#8091 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-8105-Revert-fix-run-E2E-tests-after-i18n-completes-on-release-PRs-2ea6d73d365081f2bd26cdc932acf7fb) by [Unito](https://www.unito.io)
This commit is contained in:
65
.github/workflows/ci-tests-e2e-release.yaml
vendored
65
.github/workflows/ci-tests-e2e-release.yaml
vendored
@@ -1,65 +0,0 @@
|
|||||||
# 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]
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
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
.github/workflows/ci-tests-e2e.yaml
vendored
50
.github/workflows/ci-tests-e2e.yaml
vendored
@@ -7,35 +7,17 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches-ignore:
|
branches-ignore:
|
||||||
[wip/*, draft/*, temp/*, vue-nodes-migration, sno-playwright-*]
|
[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:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ inputs.ref || github.ref }}
|
group: ${{ github.workflow }}-${{ github.ref }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
setup:
|
setup:
|
||||||
runs-on: ubuntu-latest
|
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:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref || '' }}
|
|
||||||
- name: Setup frontend
|
- name: Setup frontend
|
||||||
uses: ./.github/actions/setup-frontend
|
uses: ./.github/actions/setup-frontend
|
||||||
with:
|
with:
|
||||||
@@ -70,8 +52,6 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref || '' }}
|
|
||||||
- name: Download built frontend
|
- name: Download built frontend
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
@@ -119,8 +99,6 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref || '' }}
|
|
||||||
- name: Download built frontend
|
- name: Download built frontend
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
@@ -165,8 +143,6 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref || '' }}
|
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v4
|
||||||
@@ -202,16 +178,12 @@ jobs:
|
|||||||
# Post starting comment for non-forked PRs
|
# Post starting comment for non-forked PRs
|
||||||
comment-on-pr-start:
|
comment-on-pr-start:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: |
|
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
|
||||||
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) ||
|
|
||||||
(github.event_name == 'workflow_call' && inputs.pr_number != '')
|
|
||||||
permissions:
|
permissions:
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref || '' }}
|
|
||||||
|
|
||||||
- name: Get start time
|
- name: Get start time
|
||||||
id: start-time
|
id: start-time
|
||||||
@@ -223,8 +195,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
chmod +x scripts/cicd/pr-playwright-deploy-and-comment.sh
|
chmod +x scripts/cicd/pr-playwright-deploy-and-comment.sh
|
||||||
./scripts/cicd/pr-playwright-deploy-and-comment.sh \
|
./scripts/cicd/pr-playwright-deploy-and-comment.sh \
|
||||||
"${{ inputs.pr_number || github.event.pull_request.number }}" \
|
"${{ github.event.pull_request.number }}" \
|
||||||
"${{ github.head_ref || inputs.ref }}" \
|
"${{ github.head_ref }}" \
|
||||||
"starting" \
|
"starting" \
|
||||||
"${{ steps.start-time.outputs.time }}"
|
"${{ steps.start-time.outputs.time }}"
|
||||||
|
|
||||||
@@ -232,19 +204,13 @@ jobs:
|
|||||||
deploy-and-comment:
|
deploy-and-comment:
|
||||||
needs: [playwright-tests, merge-reports]
|
needs: [playwright-tests, merge-reports]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: |
|
if: always() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
|
||||||
always() && (
|
|
||||||
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) ||
|
|
||||||
(github.event_name == 'workflow_call' && inputs.pr_number != '')
|
|
||||||
)
|
|
||||||
permissions:
|
permissions:
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
contents: read
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
|
||||||
ref: ${{ inputs.ref || '' }}
|
|
||||||
|
|
||||||
- name: Download all playwright reports
|
- name: Download all playwright reports
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
@@ -257,10 +223,10 @@ jobs:
|
|||||||
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
GITHUB_SHA: ${{ inputs.ref || github.event.pull_request.head.sha }}
|
GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
|
||||||
run: |
|
run: |
|
||||||
bash ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
|
bash ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
|
||||||
"${{ inputs.pr_number || github.event.pull_request.number }}" \
|
"${{ github.event.pull_request.number }}" \
|
||||||
"${{ github.head_ref || inputs.ref }}" \
|
"${{ github.head_ref }}" \
|
||||||
"completed"
|
"completed"
|
||||||
#### END Deployment and commenting (non-forked PRs only)
|
#### END Deployment and commenting (non-forked PRs only)
|
||||||
|
|||||||
Reference in New Issue
Block a user