Merge branch 'development' into model-import-fixes

This commit is contained in:
Matthias Wild 2022-11-27 01:30:43 +01:00 committed by GitHub
commit 939164eaa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View File

@ -13,7 +13,6 @@ on:
jobs: jobs:
matrix: matrix:
strategy: strategy:
fail-fast: false
matrix: matrix:
stable-diffusion-model: stable-diffusion-model:
- 'stable-diffusion-1.5' - 'stable-diffusion-1.5'
@ -89,7 +88,7 @@ jobs:
env: env:
cache-name: cache-${{ matrix.stable-diffusion-model }} cache-name: cache-${{ matrix.stable-diffusion-model }}
with: with:
path: ${{ matrix.stable-diffusion-model-dl-path }} path: ${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}
key: ${{ env.cache-name }} key: ${{ env.cache-name }}
- name: Download ${{ matrix.stable-diffusion-model }} - name: Download ${{ matrix.stable-diffusion-model }}
@ -127,4 +126,4 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }} name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
path: ${{ env.INVOKEAI_ROOT }}/outputs/img-samples path: ${{ env.INVOKEAI_ROOT }}/outputs

View File

@ -12,7 +12,6 @@ on:
jobs: jobs:
matrix: matrix:
strategy: strategy:
fail-fast: false
matrix: matrix:
stable-diffusion-model: stable-diffusion-model:
- stable-diffusion-1.5 - stable-diffusion-1.5
@ -21,7 +20,7 @@ jobs:
- requirements-lin-amd.txt - requirements-lin-amd.txt
- requirements-mac-mps-cpu.txt - requirements-mac-mps-cpu.txt
python-version: python-version:
- '3.9' # - '3.9'
- '3.10' - '3.10'
include: include:
- requirements-file: requirements-lin-cuda.txt - requirements-file: requirements-lin-cuda.txt
@ -90,7 +89,7 @@ jobs:
env: env:
cache-name: cache-${{ matrix.stable-diffusion-model }} cache-name: cache-${{ matrix.stable-diffusion-model }}
with: with:
path: ${{ matrix.stable-diffusion-model-dl-path }} path: ${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}
key: ${{ env.cache-name }} key: ${{ env.cache-name }}
- name: Download ${{ matrix.stable-diffusion-model }} - name: Download ${{ matrix.stable-diffusion-model }}
@ -122,4 +121,4 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }} name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
path: ${{ env.INVOKEAI_ROOT }}/outputs/img-samples path: ${{ env.INVOKEAI_ROOT }}/outputs