Skip to content

Use --merge-install for colcon so that gz can be found during build #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
azeey wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use --merge-install for colcon so that gz can be found during build #1063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jenkins-scripts/lib/windows_library.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%^
Expand Down Expand Up @@ -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+
Expand Down