From 053cd19b0a518011cce78d486153871728da4e3c Mon Sep 17 00:00:00 2001 From: Matthias Wittgen Date: Thu, 30 Jan 2025 21:07:48 -0800 Subject: [PATCH] Set conda channels for dev environment in deploy --- bin/deploy | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/deploy b/bin/deploy index 5cc3d42..e0c04b9 100755 --- a/bin/deploy +++ b/bin/deploy @@ -17,7 +17,6 @@ LSST_EUPS_GITREPO=${LSST_EUPS_GITREPO:-https://github.com/RobertLuptonTheGood/eu # but it is not actually used to select the miniconda version. LSST_MINICONDA_VERSION="py38_4.9.2" LSST_MINICONDA_BASE_URL=${LSST_MINICONDA_BASE_URL:-https://github.com/conda-forge/miniforge/releases/latest/download} -LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"nodefaults conda-forge"} LSST_GIT_VERSION=${LSST_GIT_VERSION:-2.18.0} LSST_LFS_VERSION=${LSST_LFS_VERSION:-2.4.2} LSST_BUILD_GITREV=${LSST_BUILD_GITREV:-main} @@ -135,6 +134,8 @@ main() { parse_args "$@" + RUBIN_ENV_CONDA_CHANNELS="nodefaults conda-forge" + if [[ -n $ENV_VERSION ]]; then RUBIN_ENV_VERSION=$ENV_VERSION elif [[ -n $ENVREF ]]; then @@ -146,6 +147,11 @@ main() { RUBIN_ENV_VERSION=$LSST_SPLENV_REF fi + if [[ $RUBIN_ENV_VERSION == *dev ]]; then + RUBIN_ENV_CONDA_CHANNELS="nodefaults conda-forge/label/rubin-env_dev conda-forge" + fi + LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"${RUBIN_ENV_CONDA_CHANNELS}"} + export LSST_CONDA_ENV_NAME=${LSST_CONDA_ENV_NAME:-"${SPLENV_BASE_NAME}-${RUBIN_ENV_VERSION}"} mkdir -p "${LSSTSW}"/{sources,build,var/run,var/log,lfs,distserver/production,etc,env}