Skip to content

Commit dc5ab71

Browse files
snomiaosnomiao
authored
Merge branch 'main' into sno-storybook--settings-panel
2 parents d08c408 + d76b1ab commit dc5ab71

File tree

56 files changed

+923
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+923
-262
lines changed

‎.github/actions/setup-frontend/action.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Setup Frontend
2+
description: 'Setup ComfyUI frontend development environment'
3+
inputs:
4+
extra_server_params:
5+
description: 'Additional parameters to pass to ComfyUI server'
6+
required: false
7+
default: ''
8+
runs:
9+
using: 'composite'
10+
steps:
11+
- name: Checkout ComfyUI
12+
uses: actions/checkout@v4
13+
with:
14+
repository: 'comfyanonymous/ComfyUI'
15+
path: 'ComfyUI'
16+
17+
- name: Checkout ComfyUI_frontend
18+
uses: actions/checkout@v4
19+
with:
20+
repository: 'Comfy-Org/ComfyUI_frontend'
21+
path: 'ComfyUI_frontend'
22+
23+
- name: Copy ComfyUI_devtools from frontend repo
24+
shell: bash
25+
run: |
26+
mkdir -p ComfyUI/custom_nodes/ComfyUI_devtools
27+
cp -r ComfyUI_frontend/tools/devtools/* ComfyUI/custom_nodes/ComfyUI_devtools/
28+
29+
- name: Install pnpm
30+
uses: pnpm/action-setup@v4
31+
with:
32+
version: 10
33+
34+
- name: Setup Node.js
35+
uses: actions/setup-node@v4
36+
with:
37+
node-version: 'lts/*'
38+
cache: 'pnpm'
39+
cache-dependency-path: 'ComfyUI_frontend/pnpm-lock.yaml'
40+
41+
- name: Setup Python
42+
uses: actions/setup-python@v4
43+
with:
44+
python-version: '3.10'
45+
46+
- name: Install Python requirements
47+
shell: bash
48+
working-directory: ComfyUI
49+
run: |
50+
python -m pip install --upgrade pip
51+
pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
52+
pip install -r requirements.txt
53+
pip install wait-for-it
54+
55+
- name: Build & Install ComfyUI_frontend
56+
shell: bash
57+
working-directory: ComfyUI_frontend
58+
run: |
59+
pnpm install --frozen-lockfile
60+
pnpm build
61+
62+
- name: Start ComfyUI server
63+
shell: bash
64+
working-directory: ComfyUI
65+
run: |
66+
python main.py --cpu --multi-user --front-end-root ../ComfyUI_frontend/dist ${{ inputs.extra_server_params }} &
67+
wait-for-it --service 127.0.0.1:8188 -t 600

.github/workflows/backport.yaml renamed to .github/workflows/auto-backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6161

6262
- name: Checkout repository
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v5
6464
with:
6565
fetch-depth: 0
6666

‎.github/workflows/chromatic.yaml‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎.github/workflows/claude-pr-review.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ jobs:
2929
- name: Check if we should proceed
3030
id: check-status
3131
run: |
32-
# Get all check runs for this commit
33-
CHECK_RUNS=$(gh api repos/${{ github.repository }}/commits/${{ github.event.pull_request.head.sha }}/check-runs --jq '.check_runs[] | select(.name | test("lint-and-format|test|playwright-tests")) | {name, conclusion}')
34-
35-
# Check if any required checks failed
36-
if echo "$CHECK_RUNS" | grep -q '"conclusion": "failure"'; then
32+
CHECK_RUNS=$(gh api repos/${{ github.repository }}/commits/${{ github.event.pull_request.head.sha }}/check-runs --jq '.check_runs[] | select(.name | test("lint-and-format")) | {name, conclusion}')
33+
34+
if echo "$CHECK_RUNS" | grep -Eq '"conclusion": "(failure|cancelled|timed_out|action_required)"'; then
3735
echo "Some CI checks failed - skipping Claude review"
3836
echo "proceed=false" >> $GITHUB_OUTPUT
3937
else
@@ -50,9 +48,10 @@ jobs:
5048
timeout-minutes: 30
5149
steps:
5250
- name: Checkout repository
53-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5452
with:
5553
fetch-depth: 0
54+
ref: refs/pull/${{ github.event.pull_request.number }}/head
5655

5756
- name: Install pnpm
5857
uses: pnpm/action-setup@v4
@@ -86,4 +85,4 @@ jobs:
8685
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8786
COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
8887
BASE_SHA: ${{ github.event.pull_request.base.sha }}
89-
REPOSITORY: ${{ github.repository }}
88+
REPOSITORY: ${{ github.repository }}

.github/workflows/dev-release.yaml renamed to .github/workflows/create-dev-pypi-package.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
version: ${{ steps.current_version.outputs.version }}
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
- name: Install pnpm
2020
uses: pnpm/action-setup@v4
2121
with:
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- name: Checkout code
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666
- name: Download dist artifact
6767
uses: actions/download-artifact@v4
6868
with:

.github/workflows/create-release-candidate-branch.yaml renamed to .github/workflows/create-release-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222
with:
2323
fetch-depth: 0
2424
token: ${{ secrets.PR_GH_TOKEN || secrets.GITHUB_TOKEN }}

.github/workflows/release.yaml renamed to .github/workflows/create-release-draft.yaml

File renamed without changes.

.github/workflows/devtools-python.yaml renamed to .github/workflows/devtools-python-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Set up Python
2121
uses: actions/setup-python@v5

‎.github/workflows/lint-and-format.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout PR
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
with:
1818
token: ${{ secrets.GITHUB_TOKEN }}
1919
ref: ${{ github.event.pull_request.head.ref }}

.github/workflows/pr-playwright-deploy.yaml renamed to .github/workflows/pr-playwright-deploy-forks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
echo "Is forked: ${{ github.event.workflow_run.head_repository.full_name != github.event.workflow_run.repository.full_name }}"
3131
3232
- name: Checkout repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434

3535
- name: Get PR Number
3636
id: pr

0 commit comments

Comments
 (0)