Skip to content

Commit

Permalink
Relocate colcon code after pixi installation (#1218)
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
j-rivero authored Jan 7, 2025
1 parent 6101031 commit 465dcfa
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions jenkins-scripts/lib/colcon-default-devel-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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% (
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 465dcfa

Please sign in to comment.