...

LLNL · Sep 3, 2023 · bc4d8f4 · bc4d8f4
1 parent 2882b0a
commit bc4d8f4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -605,19 +605,20 @@ stages:
           ls -l
           # find spack installed cmake
           export ROOT_DIR=`pwd`
-          export CMAKE_BIN_DIR=`ls -d ${ROOT_DIR}/uberenv_libs/spack/opt/spack/*/*/cmake*/bin`
+          export CMAKE_BIN_DIR=`ls -d ${ROOT_DIR}/uberenv_libs/spack/opt/spack/*/*/cmake*/bin/`
           export PATH=${CMAKE_BIN_DIR}:$PATH
           echo $PATH
           # find spack installed python (use spack view dir)
-          export PYTHON_EXE=`ls -d ${ROOT_DIR}/uberenv_libs/spack_env/view/python*/bin/python3`
+          export PYTHON_EXE=`ls ${ROOT_DIR}/uberenv_libs/spack_env/view/python*/bin/python3`
           # add conduit module to python path
           export PYTHONPATH=${ROOT_DIR}/install/python-modules/
           # NOTE:
           #  also add spack's python view dir to python path env var
           #  this wasn't needed with older spack. 
           #  I think embedded linking logic is resolving symlinks and therefore
           #  not using view layout that wires up dependent python modules
-          export PYTHONPATH=${PYTHONPATH}:${ROOT_DIR}/uberenv_libs/spack_env/view/python*/lib/python*/site-packages/`
+          py_site_pkgs_dir=`ls -d ${ROOT_DIR}/uberenv_libs/spack_env/view/python*/lib/python*/site-packages/`
+          export PYTHONPATH=${PYTHONPATH}:${py_site_pkgs_dir}
           echo $PYTHONPATH
           # CI LD_LIB FIX
           # NOTE: