diff --git a/.github/workflows/sub_buildMacOSCondaApple.yml b/.github/workflows/sub_buildMacOSCondaApple.yml index f92043c755..59fc1666f2 100644 --- 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 diff --git a/.github/workflows/sub_buildMacOSCondaIntel.yml b/.github/workflows/sub_buildMacOSCondaIntel.yml index 102ca48cf8..b4d4e80b32 100644 --- 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 diff --git a/.github/workflows/sub_buildUbuntu2204Conda.yml b/.github/workflows/sub_buildUbuntu2204Conda.yml index 4e47caacad..43d31ec714 100644 --- 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 diff --git a/.github/workflows/sub_buildUbuntu2204CondaQt6.yml b/.github/workflows/sub_buildUbuntu2204CondaQt6.yml index 9c4cd26616..59fca06b8d 100644 --- 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 diff --git a/.github/workflows/sub_buildWindowsConda.yml b/.github/workflows/sub_buildWindowsConda.yml index 8acb274bcd..e51d5cc35a 100644 --- 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 diff --git a/conda/conda-env-qt6.yaml b/conda/conda-env-qt6.yaml index ed542fbf70..7fe8ee0ab4 100644 --- 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.* diff --git a/conda/conda-env.yaml b/conda/conda-env.yaml index eb2448722f..ecc36e8410 100644 --- 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.* diff --git a/conda/environment-qt6.devenv.yml b/conda/environment-qt6.devenv.yml index ad4025587c..6f44acd7de 100644 --- 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] diff --git a/conda/environment.devenv.yml b/conda/environment.devenv.yml index 45dd753303..20c93e576b 100644 --- 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]