From afae108cec548794de1fb47d690ab555d5b9ce97 Mon Sep 17 00:00:00 2001
From: Kevin Turner <83819+keturn@users.noreply.github.com>
Date: Thu, 24 Nov 2022 20:12:48 -0800
Subject: [PATCH] ci: use diffusers model

---
 .github/workflows/test-invoke-conda.yml |  6 +-----
 .github/workflows/test-invoke-pip.yml   | 10 +++-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index fb625759fc6..92ab6b5a6e2 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         stable-diffusion-model:
-          - 'stable-diffusion-1.5'
+          - 'diffusers-1.5'
         environment-yaml:
           - environment-lin-amd.yml
           - environment-lin-cuda.yml
@@ -30,10 +30,6 @@ jobs:
           - environment-yaml: environment-mac.yml
             os: macos-12
             default-shell: bash -l {0}
-          - stable-diffusion-model: stable-diffusion-1.5
-            stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
-            stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
     name: ${{ matrix.environment-yaml }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index a101e7d99cb..10c9c7d7f64 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         stable-diffusion-model:
-          - stable-diffusion-1.5
+          - diffusers-1.5
         requirements-file:
           - requirements-lin-cuda.txt
           - requirements-lin-amd.txt
@@ -33,10 +33,6 @@ jobs:
           - requirements-file: requirements-mac-mps-cpu.txt
             os: macOS-12
             default-shell: bash -l {0}
-          - stable-diffusion-model: stable-diffusion-1.5
-            stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
-            stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
     name: ${{ matrix.requirements-file }} on ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     defaults:
@@ -60,9 +56,9 @@ jobs:
         id: cache-sd-model
         uses: actions/cache@v3
         env:
-          cache-name: cache-${{ matrix.stable-diffusion-model }}
+          cache-name: huggingface-${{ matrix.stable-diffusion-model }}
         with:
-          path: ${{ matrix.stable-diffusion-model-dl-path }}
+          path: ~/.cache/huggingface
           key: ${{ env.cache-name }}
 
       - name: Check model availability