From 359ae24833663add661883896d2079e3c0299f55 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 9 Nov 2023 14:55:04 -0600 Subject: [PATCH] Use `--merge-install` for colcon so that `gz` can be found during build Signed-off-by: Addisu Z. Taddese --- jenkins-scripts/lib/windows_library.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/lib/windows_library.bat b/jenkins-scripts/lib/windows_library.bat index 6701f26a7..8ab14e823 100644 --- a/jenkins-scripts/lib/windows_library.bat +++ b/jenkins-scripts/lib/windows_library.bat @@ -194,7 +194,7 @@ echo "COLCON_EXTRA_ARGS: %COLCON_EXTRA_ARGS% %COLCON_PACKAGE%" echo "COLCON_EXTRA_CMAKE_ARGS: %COLCON_EXTRA_CMAKE_ARGS%" echo "COLCON_EXTRA_CMAKE_ARGS2: %COLCON_EXTRA_CMAKE_ARGS2%" -colcon build --build-base "build"^ +colcon build --merge-install --build-base "build"^ --install-base "install"^ --parallel-workers %MAKE_JOBS%^ %COLCON_EXTRA_ARGS% %COLCON_PACKAGE%^ @@ -243,7 +243,7 @@ goto :EOF set COLCON_PACKAGE=%1 echo # BEGIN SECTION: colcon test for !COLCON_PACKAGE! -colcon test --install-base "install"^ +colcon test --merge-install --install-base "install"^ --packages-select !COLCON_PACKAGE!^ --executor sequential^ --event-handler console_direct+