CI: Fix conda builds.

2024-09-26 11:03:46 -07:00
parent 69676a0f9d
commit d519f24df9
9 changed files with 9 additions and 5 deletions
--- a/.github/workflows/sub_buildMacOSCondaApple.yml
+++ b/.github/workflows/sub_buildMacOSCondaApple.yml
@@ -78,7 +78,7 @@ jobs:
        with:
          activate-environment: .conda/freecad
          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
          channel-priority: true
          miniforge-version: latest
      - name: Install FreeCAD dependencies
--- a/.github/workflows/sub_buildMacOSCondaIntel.yml
+++ b/.github/workflows/sub_buildMacOSCondaIntel.yml
@@ -78,7 +78,7 @@ jobs:
        with:
          activate-environment: .conda/freecad
          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
          channel-priority: true
          miniforge-version: latest
      - name: Install FreeCAD dependencies
--- a/.github/workflows/sub_buildUbuntu2204Conda.yml
+++ b/.github/workflows/sub_buildUbuntu2204Conda.yml
@@ -76,7 +76,7 @@ jobs:
        with:
          activate-environment: .conda/freecad
          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
          channel-priority: true
          miniforge-version: latest
      - name: Install FreeCAD dependencies
--- a/.github/workflows/sub_buildUbuntu2204CondaQt6.yml
+++ b/.github/workflows/sub_buildUbuntu2204CondaQt6.yml
@@ -76,7 +76,7 @@ jobs:
        with:
          activate-environment: .conda/freecad
          environment-file: conda/conda-env-qt6.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
          channel-priority: true
          miniforge-version: latest
      - name: Install FreeCAD dependencies
--- a/.github/workflows/sub_buildWindowsConda.yml
+++ b/.github/workflows/sub_buildWindowsConda.yml
@@ -71,7 +71,7 @@ jobs:
        with:
          activate-environment: .conda/freecad
          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
          channel-priority: true
          miniforge-version: latest
      - name: Install FreeCAD dependencies
--- a/conda/conda-env-qt6.yaml
+++ b/conda/conda-env-qt6.yaml
@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - conda-devenv
 - mamba
 - python==3.12.*
--- a/conda/conda-env.yaml
+++ b/conda/conda-env.yaml
@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - conda-devenv
 - mamba
 - python==3.11.*
--- a/conda/environment-qt6.devenv.yml
+++ b/conda/environment-qt6.devenv.yml
@@ -3,6 +3,7 @@ channels:
 - conda-forge
 - conda-forge/label/pivy_rc
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos7-x86_64                   # [linux and x86_64]
--- a/conda/environment.devenv.yml
+++ b/conda/environment.devenv.yml
@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos6-x86_64                   # [linux and x86_64]