try to activate the *correct* conda env

Comfy-Org · Jul 11, 2024 · 75ec40e · 75ec40e
1 parent f42493f
commit 75ec40e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/action.yml b/action.yml
@@ -295,7 +295,7 @@ runs:
         Write-Output "##############################"
         Write-Output $envGithubWorkspace
         Write-Output "##############################"
-        Start-Process powershell -ArgumentList "-File", "${{ github.action_path }}\start-server.ps1", "-GITHUB_WORKSPACE", "`"$envGithubWorkspace`""
+        Start-Process powershell -ArgumentList "-File", "${{ github.action_path }}\start-server.ps1", "-GITHUB_WORKSPACE", "`"$envGithubWorkspace`"", "-CondaEnv", "`"gha-comfyui-${{ inputs.python_version }}-${{ inputs.torch_version }}`""
 
     - name: '[Win] Check if the server is running'
       if: ${{ inputs.os == 'windows' }}

diff --git a/start-server.ps1 b/start-server.ps1
@@ -1,9 +1,15 @@
 # start-server.ps1
 param (
     [String]$GITHUB_WORKSPACE,
-    [String]$PythonFlags
+    [String]$PythonFlags,
+    [String]$CondaEnv
 )
 
+# Initialize Conda environment
+# TODO: remove hardcoding
+echo "Starting Conda"
+conda activate "$CondaEnv"
+
 # Start the web server and redirect output to a log file
 echo "Running Server"
 python "$GITHUB_WORKSPACE/main.py" --force-fp16 *> "$GITHUB_WORKSPACE/application.log"