Skip to content

Commit ad489bb

Browse files
committed
Merge branch 'main' into lstein/feature/wan-video-support
# Conflicts: # invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts # invokeai/frontend/web/src/services/api/hooks/modelsByType.ts
2 parents 5c6b72d + 75f1992 commit ad489bb

51 files changed

Lines changed: 131092 additions & 386 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.

.github/actions/install-frontend-deps/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ description: Installs frontend dependencies with pnpm, with caching
33
runs:
44
using: 'composite'
55
steps:
6-
- name: setup node 20
7-
uses: actions/setup-node@v4
6+
- name: setup node 22
7+
uses: actions/setup-node@v6
88
with:
9-
node-version: '20'
9+
node-version: '22'
1010

1111
- name: setup pnpm
12-
uses: pnpm/action-setup@v4
12+
uses: pnpm/action-setup@v6
1313
with:
1414
version: 10
1515
run_install: false
@@ -20,7 +20,7 @@ runs:
2020
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
2121
2222
- name: setup cache
23-
uses: actions/cache@v4
23+
uses: actions/cache@v5
2424
with:
2525
path: ${{ env.STORE_PATH }}
2626
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}

.github/workflows/build-container.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ jobs:
6666
df -h
6767
6868
- name: Checkout
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@v6
7070

7171
- name: Docker meta
7272
id: meta
73-
uses: docker/metadata-action@v5
73+
uses: docker/metadata-action@v6
7474
with:
7575
github-token: ${{ secrets.GITHUB_TOKEN }}
7676
images: |
@@ -87,13 +87,13 @@ jobs:
8787
suffix=-${{ matrix.gpu-driver }},onlatest=false
8888
8989
- name: Set up Docker Buildx
90-
uses: docker/setup-buildx-action@v3
90+
uses: docker/setup-buildx-action@v4
9191
with:
9292
platforms: ${{ env.PLATFORMS }}
9393

9494
- name: Login to GitHub Container Registry
9595
if: github.event_name != 'pull_request'
96-
uses: docker/login-action@v3
96+
uses: docker/login-action@v4
9797
with:
9898
registry: ghcr.io
9999
username: ${{ github.repository_owner }}
@@ -102,7 +102,7 @@ jobs:
102102
- name: Build container
103103
timeout-minutes: 40
104104
id: docker_build
105-
uses: docker/build-push-action@v6
105+
uses: docker/build-push-action@v7
106106
with:
107107
context: .
108108
file: docker/Dockerfile

.github/workflows/build-wheel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
timeout-minutes: 5 # expected run time: <2 min
1313
steps:
1414
- name: checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- name: setup python
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: '3.12'
2121
cache: pip
@@ -32,7 +32,7 @@ jobs:
3232
run: ./scripts/build_wheel.sh
3333

3434
- name: upload python distribution artifact
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: dist
3838
path: ${{ steps.build_wheel.outputs.DIST_PATH }}

.github/workflows/clean-caches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v6
1414

1515
- name: Cleanup
1616
run: |

.github/workflows/close-inactive-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
pull-requests: write
1616
steps:
17-
- uses: actions/stale@v8
17+
- uses: actions/stale@v10
1818
with:
1919
days-before-issue-stale: ${{ env.DAYS_BEFORE_ISSUE_STALE }}
2020
days-before-issue-close: ${{ env.DAYS_BEFORE_ISSUE_CLOSE }}

.github/workflows/deploy-docs.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
docs: ${{ steps.manual.outputs.docs || steps.filter.outputs.docs }}
3535
steps:
3636
- name: checkout
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v6
3838
with:
3939
fetch-depth: 0
4040

@@ -70,34 +70,34 @@ jobs:
7070
timeout-minutes: 20
7171
steps:
7272
- name: checkout
73-
uses: actions/checkout@v4
73+
uses: actions/checkout@v6
7474

7575
# Python (needed for generate-docs-data)
7676
- name: setup uv
77-
uses: astral-sh/setup-uv@v5
77+
uses: astral-sh/setup-uv@v8.1.0
7878
with:
79-
version: '0.6.10'
79+
version: '0.11.12'
8080
enable-cache: true
8181
python-version: '3.11'
8282

8383
- name: setup python
84-
uses: actions/setup-python@v5
84+
uses: actions/setup-python@v6
8585
with:
8686
python-version: '3.11'
8787

8888
# generate_docs_json.py only needs the invokeai package importable
8989
# (pydantic + invokeai.app/backend). Skip the [test] extra to keep CI fast.
9090
- name: install python dependencies
91-
run: uv pip install --editable .
91+
run: uv sync --frozen
9292

9393
# Node (needed for docs build)
9494
- name: setup node
95-
uses: actions/setup-node@v4
95+
uses: actions/setup-node@v6
9696
with:
97-
node-version: '22.12.0'
97+
node-version: '22'
9898

9999
- name: setup pnpm
100-
uses: pnpm/action-setup@v4
100+
uses: pnpm/action-setup@v6
101101
with:
102102
version: 10
103103
run_install: false
@@ -129,7 +129,7 @@ jobs:
129129
# Upload artifact for deploy (main branch only)
130130
- name: upload pages artifact
131131
if: github.ref == 'refs/heads/main'
132-
uses: actions/upload-pages-artifact@v3
132+
uses: actions/upload-pages-artifact@v5
133133
with:
134134
path: docs/dist
135135

@@ -147,4 +147,4 @@ jobs:
147147
steps:
148148
- name: deploy to GitHub Pages
149149
id: deployment
150-
uses: actions/deploy-pages@v4
150+
uses: actions/deploy-pages@v5

.github/workflows/frontend-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
timeout-minutes: 10 # expected run time: <2 min
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
4343

4444
- name: Fail if package-lock.json is added/modified (pnpm only)
4545
shell: bash
@@ -60,7 +60,7 @@ jobs:
6060
# - CVE-2025-30066
6161
# - https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised
6262
# - https://github.com/tj-actions/changed-files/issues/2463
63-
uses: tj-actions/changed-files@a284dc1814e3fd07f2e34267fc8f81227ed29fb8
63+
uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96
6464
with:
6565
files_yaml: |
6666
frontend:

.github/workflows/frontend-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
timeout-minutes: 10 # expected run time: <2 min
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
4343

4444
- name: check for changed frontend files
4545
if: ${{ inputs.always_run != true }}
@@ -49,7 +49,7 @@ jobs:
4949
# - CVE-2025-30066
5050
# - https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised
5151
# - https://github.com/tj-actions/changed-files/issues/2463
52-
uses: tj-actions/changed-files@a284dc1814e3fd07f2e34267fc8f81227ed29fb8
52+
uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96
5353
with:
5454
files_yaml: |
5555
frontend:

.github/workflows/label-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414

1515
- name: label PRs
16-
uses: actions/labeler@v5
16+
uses: actions/labeler@v6
1717
with:
1818
configuration-path: .github/pr_labels.yml

.github/workflows/lfs-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
pull-requests: write
2525
steps:
2626
- name: checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828

2929
- name: check lfs files
3030
uses: ppremk/lfs-warning@v3.3

0 commit comments

Comments
 (0)