Skip to content

Commit 38c5b37

Browse files
Move conda build tools to base environment (#39177)
* Move build tools to conda base environment in package-conda At least one of these dependencies causes conda to be installed, which should only be done inside the base environment. * Move conda build tool to base env in package-standalone conda build tools bring in conda as a dependency, so should only be installed inside the base environment. Also, I think conda-index is the correct dependency here.
1 parent 25ab19d commit 38c5b37

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

buildconfig/Jenkins/Conda/package-conda

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ done
8282

8383

8484
# Mamba
85-
setup_mamba $WORKSPACE/mambaforge "package-conda" true
86-
# CMake FindPython doesn't work correctly with conda 25.3.0
87-
mamba install --yes boa conda-verify versioningit conda=25.1.1
85+
setup_mamba $WORKSPACE/mambaforge "" true
86+
mamba activate base
87+
mamba install --yes boa conda-verify versioningit
8888

8989
# Clean up any legacy conda-recipes git clones
9090
cd $WORKSPACE

buildconfig/Jenkins/Conda/package-standalone

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ do
5959
done
6060

6161
# Mamba
62-
setup_mamba $WORKSPACE/mambaforge "package-standalone"
63-
# Pin conda to known working version. In 24.9 the post-link.bat script doesn't work.
64-
mamba install --yes mamba=1.5 conda-build conda=24.7
62+
setup_mamba $WORKSPACE/mambaforge "" true
63+
mamba activate base
64+
mamba install --yes conda-index
6565

6666
# Build packages
6767
# Setup a local conda channel to find our locally built packages package. It is

0 commit comments

Comments
 (0)