Skip to content

Commit

Permalink
Update conda build to source before running tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong committed Sep 19, 2024
1 parent 2e90ad9 commit ce20f46
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/conda/recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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%
if %errorlevel% neq 0 exit /b %errorlevel%
4 changes: 3 additions & 1 deletion .github/workflows/conda/recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
done

0 comments on commit ce20f46

Please sign in to comment.