Skip to content

Commit 852a466

Browse files
authored
Merge branch 'main' into add-german-locale
2 parents 8cb5cfa + 085c6ec commit 852a466

246 files changed

Lines changed: 34656 additions & 623 deletions

File tree

Some content is hidden

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

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ packages/registry-types/src/comfyRegistryTypes.ts linguist-generated=true
66
packages/ingest-types/src/types.gen.ts linguist-generated=true
77
packages/ingest-types/src/zod.gen.ts linguist-generated=true
88
src/workbench/extensions/manager/types/generatedManagerTypes.ts linguist-generated=true
9+
browser_tests/fixtures/data/customNodeManifest.cloud.json linguist-generated=true

.github/actions/changes-filter/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ runs:
5151
- name: Filter typed changes
5252
if: ${{ github.event_name == 'pull_request' }}
5353
id: filter
54-
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
54+
uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
5555
with:
5656
filters: |
5757
app_website:
@@ -75,7 +75,7 @@ runs:
7575
- name: Filter relevant changes
7676
if: ${{ github.event_name == 'pull_request' }}
7777
id: relevant
78-
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
78+
uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
7979
with:
8080
predicate-quantifier: 'every'
8181
filters: |

.github/actions/setup-comfyui-server/action.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ inputs:
99
description: 'Whether to launch the server after setup'
1010
required: false
1111
default: 'false'
12+
comfyui_ref:
13+
description: 'ComfyUI git ref to check out (tag/branch/SHA). Empty = default branch (master).'
14+
required: false
15+
default: ''
1216
runs:
1317
using: 'composite'
1418
steps:
@@ -19,6 +23,7 @@ runs:
1923
uses: actions/checkout@v7
2024
with:
2125
repository: 'comfyanonymous/ComfyUI'
26+
ref: ${{ inputs.comfyui_ref }}
2227
path: 'ComfyUI'
2328

2429
- name: Install ComfyUI_devtools from frontend repo

.github/actions/setup-frontend/action.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
description: 'Include the build step to build the frontend. Set to true for workflows that need a built frontend'
66
required: false
77
default: 'false'
8+
node_cache:
9+
description: "Share the lockfile-keyed pnpm store cache. Set to 'false' in jobs that execute unreviewed third-party code: setup-node's post step writes the store AFTER the job body, and the same key is restored by the publish workflows, which hold NPM_TOKEN, PYPI_TOKEN and id-token: write."
10+
required: false
11+
default: 'true'
812
runs:
913
using: 'composite'
1014
steps:
@@ -18,7 +22,7 @@ runs:
1822
uses: actions/setup-node@v6
1923
with:
2024
node-version-file: '.nvmrc'
21-
cache: 'pnpm'
25+
cache: ${{ inputs.node_cache == 'true' && 'pnpm' || '' }}
2226
cache-dependency-path: './pnpm-lock.yaml'
2327

2428
- name: Install dependencies

.github/actions/setup-playwright/action.yaml

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: Setup Playwright
22
description: Cache and install Playwright browsers with dependencies
3+
inputs:
4+
install_deps:
5+
description: Install Playwright operating-system dependencies
6+
required: false
7+
default: 'true'
38
runs:
49
using: composite
510
steps:
@@ -17,12 +22,33 @@ runs:
1722
path: '~/.cache/ms-playwright'
1823
key: ${{ runner.os }}-playwright-browsers-${{ steps.detect-version.outputs.playwright-version }}
1924

20-
- name: Install Playwright Browsers
21-
if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
25+
- name: Bound Playwright dependency downloads
26+
if: inputs.install_deps == 'true'
2227
shell: bash
23-
run: pnpm exec playwright install chromium --with-deps
28+
run: |
29+
set -euo pipefail
30+
printf '%s\n' \
31+
'Acquire::Retries "3";' \
32+
'Acquire::http::Timeout "60";' \
33+
'Acquire::https::Timeout "60";' \
34+
| sudo tee /etc/apt/apt.conf.d/80-playwright-ci >/dev/null
2435
25-
- name: Install Playwright Browsers (operating system dependencies)
26-
if: steps.cache-playwright-browsers.outputs.cache-hit == 'true'
36+
- name: Install Playwright browser and dependencies
2737
shell: bash
28-
run: pnpm exec playwright install-deps
38+
env:
39+
BROWSER_CACHE_HIT: ${{ steps.cache-playwright-browsers.outputs.cache-hit }}
40+
INSTALL_DEPS: ${{ inputs.install_deps }}
41+
run: |
42+
set -euo pipefail
43+
if [ "$INSTALL_DEPS" != true ]; then
44+
playwright_args=(install chromium)
45+
elif [ "$BROWSER_CACHE_HIT" = true ]; then
46+
playwright_args=(install-deps chromium)
47+
else
48+
playwright_args=(install chromium --with-deps)
49+
fi
50+
for attempt in 1 2; do
51+
pnpm exec playwright "${playwright_args[@]}" && exit 0
52+
[ "$attempt" -lt 2 ] || exit 1
53+
sleep 2
54+
done

0 commit comments

Comments
 (0)