From 4133b50e7376c8f5f7131ef7110aa8a8a80edd49 Mon Sep 17 00:00:00 2001
From: Levi Armstrong <levi.armstrong@gmail.com>
Date: Thu, 19 Sep 2024 09:13:22 -0500
Subject: [PATCH] Update conda build to source before running tests

---
 .github/workflows/conda/recipe/bld.bat  | 6 +++++-
 .github/workflows/conda/recipe/build.sh | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/conda/recipe/bld.bat b/.github/workflows/conda/recipe/bld.bat
index 8802c8efadd..99f72d6a659 100644
--- a/.github/workflows/conda/recipe/bld.bat
+++ b/.github/workflows/conda/recipe/bld.bat
@@ -21,6 +21,10 @@ colcon build --merge-install --install-base="%PREFIX%\opt\tesseract_robotics" ^
 
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+call "%PREFIX%\opt\tesseract_robotics\setup.bat"
+
+set TESSERACT_PYTHON_DLL_PATH=%PREFIX%\opt\tesseract_robotics\bin
+
 colcon test --event-handlers console_direct+ --return-code-on-test-failure ^
    --packages-ignore gtest osqp osqp_eigen tesseract_examples trajopt_ifopt trajopt_sqp tesseract_common ^
    --merge-install --install-base="%PREFIX%\opt\tesseract_robotics"
@@ -36,4 +40,4 @@ for %%F in (activate deactivate) DO (
     copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
 )
 
-if %errorlevel% neq 0 exit /b %errorlevel%
\ No newline at end of file
+if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/.github/workflows/conda/recipe/build.sh b/.github/workflows/conda/recipe/build.sh
index afd9e601686..d5765129126 100755
--- a/.github/workflows/conda/recipe/build.sh
+++ b/.github/workflows/conda/recipe/build.sh
@@ -17,6 +17,8 @@ colcon build --merge-install --install-base="$PREFIX/opt/tesseract_robotics" \
    -DSETUPTOOLS_DEB_LAYOUT=OFF \
    -DTESSERACT_ENABLE_TESTING=ON
 
+source "$PREFIX/opt/tesseract_robotics/setup.sh"
+
 colcon test --event-handlers console_direct+ --return-code-on-test-failure \
    --packages-ignore gtest osqp osqp_eigen tesseract_examples trajopt_ifopt trajopt_sqp tesseract_common \
    --merge-install --install-base="$PREFIX/opt/tesseract_robotics" 
@@ -26,4 +28,4 @@ for CHANGE in "activate" "deactivate"
 do
     mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
     cp "${RECIPE_DIR}/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
-done
\ No newline at end of file
+done