From bb0d0d6a0038c80697aecacf45747f8303f00ad9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 28 Feb 2025 12:35:15 -0800 Subject: [PATCH 1/2] Replace `conda-mambabuild` with `conda-build` These are now equivalent in behavior. However support for `conda-mambabuild` is being dropped. So switch to `conda-build`. --- ci/conda/recipes/run_conda_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 060834ae9..59c5c98d5 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -38,7 +38,7 @@ export x="\033[0m" export CONDA_ALWAYS_YES=true # Change this to switch between build/mambabuild/debug -export CONDA_COMMAND=${CONDA_COMMAND:-"mambabuild"} +export CONDA_COMMAND=${CONDA_COMMAND:-"build"} # Get the path to the morpheus git folder export MORPHEUS_ROOT=${MORPHEUS_ROOT:-$(git rev-parse --show-toplevel)} From ab944d3ad974c1cef8a067bda5ea000a3911c1ac Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 4 Mar 2025 14:09:58 -0800 Subject: [PATCH 2/2] Drop `--use-local` flag to `conda build` The default behavior of `conda-build` is to use packages from its local cache. Given this, we don't need this flag. It also causes `conda-build` to look in a different place than we typically use for the package cache on CI, which causes its own problems. --- ci/conda/recipes/run_conda_build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 59c5c98d5..82ce2e385 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -105,9 +105,6 @@ if hasArg upload; then fi fi -# Some default args -CONDA_ARGS_ARRAY+=("--use-local") - if [[ "${CONDA_COMMAND}" == "mambabuild" || "${CONDA_COMMAND}" == "build" ]]; then # Remove the timestamp from the work folder to allow caching to work better CONDA_ARGS_ARRAY+=("--build-id-pat" "{n}-{v}")