From 00c0e487dd6be4eb61a55de33e8dc639e2a9b17e Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 17 Oct 2022 03:27:15 +0200
Subject: [PATCH] move export behind the tests, upload with artifact also
 switch to python between 3.9-3.10 and use conda-forge again

---
 .github/workflows/test-invoke-conda.yml | 8 +++++---
 environment-mac.yml                     | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index bac94b303e..157a68b8c6 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -97,9 +97,6 @@ jobs:
           activate-environment: ${{ env.CONDA_ENV_NAME }}
           environment-file: ${{ matrix.environment-file }}
 
-      - name: export conda env
-        run: conda env export --name ${{ env.CONDA_ENV_NAME }}
-
       - name: Use Cached Huggingface and Torch models
         id: cache-hugginface-torch
         uses: actions/cache@v3
@@ -118,10 +115,15 @@ jobs:
         run: |
           time python scripts/invoke.py \
             --from_file ${{ env.TEST_PROMPTS }}
+
+      - name: export conda env
+        run: |
           mkdir -p outputs/img-samples
+          conda env export --name ${{ env.CONDA_ENV_NAME }} > outputs/img-samples/environment-${{ runner.os }}.yml
 
       - name: Archive results
         uses: actions/upload-artifact@v3
         with:
           name: results_${{ matrix.os }}
           path: outputs/img-samples
+
diff --git a/environment-mac.yml b/environment-mac.yml
index f583ad7bb9..01e3f28e7f 100644
--- a/environment-mac.yml
+++ b/environment-mac.yml
@@ -1,9 +1,9 @@
 name: invokeai
 channels:
   - pytorch
-  - defaults
+  - conda-forge
 dependencies:
-  - python>=3.10, <3.11
+  - python>=3.9, <3.10
   - pip>=22.2
 
   # pytorch left unpinned