From 465dcfaeca4578870e17410fca0929128f293685 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 7 Jan 2025 12:40:51 +0100 Subject: [PATCH] Relocate colcon code after pixi installation (#1218) Signed-off-by: Jose Luis Rivero --- .../lib/colcon-default-devel-windows.bat | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/jenkins-scripts/lib/colcon-default-devel-windows.bat b/jenkins-scripts/lib/colcon-default-devel-windows.bat index 06048c6be..c356b0361 100644 --- a/jenkins-scripts/lib/colcon-default-devel-windows.bat +++ b/jenkins-scripts/lib/colcon-default-devel-windows.bat @@ -78,25 +78,6 @@ echo # END SECTION echo # BEGIN SECTION: vcpkg: list installed packages call %win_lib% :list_vcpkg_packages || goto :error -:: Check if package is in colcon workspace -echo # BEGIN SECTION: Update package !COLCON_PACKAGE! from gz to ignition -echo Packages in workspace: -colcon list --names-only - -colcon list --names-only | find "!COLCON_PACKAGE!" -if errorlevel 1 ( - :: REQUIRED for Gazebo Fortress - set COLCON_PACKAGE=!COLCON_PACKAGE:gz=ignition! - set COLCON_PACKAGE=!COLCON_PACKAGE:sim=gazebo! -) -colcon list --names-only | find "!COLCON_PACKAGE!" -if errorlevel 1 ( - echo Failed to find package !COLCON_PACKAGE! in workspace. - goto :error -) -echo Using package name !COLCON_PACKAGE! -echo # END SECTION - echo # BEGIN SECTION: setup workspace if not defined KEEP_WORKSPACE ( IF exist %LOCAL_WS_BUILD% ( @@ -128,6 +109,26 @@ if exist %LOCAL_WS_SOFTWARE_DIR%\configure.bat ( echo "DEPRECATED configure.bat file detected. It should be removed from upstream sources" ) +:: Check if package is in colcon workspace +echo # BEGIN SECTION: Update package !COLCON_PACKAGE! from gz to ignition +echo Packages in workspace: +colcon list --names-only + +colcon list --names-only | find "!COLCON_PACKAGE!" +if errorlevel 1 ( + :: REQUIRED for Gazebo Fortress + set COLCON_PACKAGE=!COLCON_PACKAGE:gz=ignition! + set COLCON_PACKAGE=!COLCON_PACKAGE:sim=gazebo! +) +colcon list --names-only | find "!COLCON_PACKAGE!" +if errorlevel 1 ( + echo Failed to find package !COLCON_PACKAGE! in workspace. + goto :error +) +echo Using package name !COLCON_PACKAGE! +echo # END SECTION + + echo # BEGIN SECTION: compiling %VCS_DIRECTORY% cd %LOCAL_WS% call %win_lib% :build_workspace !COLCON_PACKAGE! !COLCON_PACKAGE_EXTRA_CMAKE_ARGS! || goto :error