Merge pull request FreeCAD#11768 from oursland/mamba-devenv-no-prune

CI: Fix issues affecting conda devenv installation resulting in failures.
herbkonik · Jan 7, 2024 · 59fdebd · 59fdebd
2 parents 108ea5d + b722790
commit 59fdebd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/conda/conda-env.yaml b/conda/conda-env.yaml
@@ -3,6 +3,6 @@ channels:
 - conda-forge
 dependencies:
 - conda-devenv
-- mamba==1.4.9  # NOTE: Pin to highest version supported by the devenv
-- python==3.11  # dependencies. If a higher version is installed, a crash
-                # occurs during the downgrade process.
+- mamba==1.4.9    # NOTE: Pin to highest version supported by the devenv
+- python==3.11.*  # dependencies. If a higher version is installed, a crash
+                  # occurs during the downgrade process.
diff --git a/conda/setup-environment.cmd b/conda/setup-environment.cmd
@@ -7,4 +7,4 @@ call conda config --add envs_dirs %CD%/.conda
 call conda config --set env_prompt "({name})"
 
 :: install the FreeCAD dependencies into the environment
-call mamba run --live-stream -n freecad mamba-devenv -f conda/environment.devenv.yml
+call mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml
diff --git a/conda/setup-environment.sh b/conda/setup-environment.sh
@@ -9,4 +9,4 @@ conda config --add envs_dirs $(pwd)/.conda
 conda config --set env_prompt "({name})"
 
 # install the FreeCAD dependencies into the environment
-mamba run --live-stream -n freecad mamba-devenv -f conda/environment.devenv.yml
+mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml