Skip to content
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

Relocate colcon code after pixi installation #1218

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Relocate colcon code after pixi installation #1218

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
39 changes: 20 additions & 19 deletions jenkins-scripts/lib/colcon-default-devel-windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,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 @@ -123,6 +104,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