-
Notifications
You must be signed in to change notification settings - Fork 7
Full rebuild August 2026 bump ros2-distro-mutex to 0.19.0 and build number to 24 #31
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.
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
Open
mini-1235
wants to merge
47
commits into
RoboStack:main
Choose a base branch
from
mini-1235:codex/rolling-full-rebuild-2026-07-30
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4,234
−6,662
Open
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
70ac789
Prepare rolling full rebuild
mini-1235 645182c
Drop obsolete upstreamed patches
mini-1235 7a41366
Fix Autoware rolling CI patches
mini-1235 2de5633
Fix remaining Autoware test utils patch hunk
mini-1235 0f0889f
Fix Autoware lanelet2 utils rclcpp includes
mini-1235 25cd62a
Fix additional Autoware rolling includes
mini-1235 eea4280
Fix Autoware velocity smoother rclcpp ok include
mini-1235 ff7f0fa
Fix Autoware behavior velocity planner share paths
mini-1235 7a474fe
Fix Autoware path generator rclcpp ok include
mini-1235 691653a
Fix MoveIt ament index API usage
mini-1235 1e85be5
Fix MoveIt ROS control interface include
mini-1235 583a64d
Fix tf2 node argument patches
mini-1235 15ae0b4
Fix moveit
mini-1235 aa1e05c
Fix tf2 node interface patches
mini-1235 3d3ab20
Fix laser filter, ur controller and pytree
mini-1235 17c758e
Fix plotjuggler and autoware ekf
mini-1235 c4f4dc2
Bump stdlib version to 13.3 for osx
mini-1235 c5fb9ba
Fix plotjuggler and odom to tf
mini-1235 83c24e7
Fix moveit ros perception and rviz satellite
mini-1235 da67a6e
Bump protobuf to 7.35.1
mini-1235 91a3dfa
Fix pointcloud to laserscan and ouster ros
mini-1235 d325cbc
Bump versions and disable cache
mini-1235 99d2a84
Fix dependency conflict, add patches for turtlesim and rosgraph monitor
mini-1235 d7b68a1
Bump vinca and enable cache
mini-1235 3c0ab9e
Use Vinca package_name_mode=both
mini-1235 46aad74
Unvendor iceoryx
mini-1235 0a06c91
Unpin cmake and disable cache
mini-1235 a3577e9
Fix pixi warnings, try adding ament-cmake-python patch for windows
mini-1235 9af6e52
Fix mrt cmake version and enable cache
mini-1235 737a127
Fix osqp cmake version and disable cache
mini-1235 25f3161
Patch lanelet2 and enable cache
mini-1235 d65cbb7
Remove cm executors as it is merged in rclcpp
mini-1235 f8ad463
Remove nav2 patches as they are outdated and not building in rolling
mini-1235 de26c08
Remove rclcpp win patch as it is merged upstream
mini-1235 dc681aa
Update vinca to latest version
mini-1235 deb10cf
Update rosidl generator py patch
mini-1235 8310501
Refresh snapshot again 0816
mini-1235 de8db65
Remove osqp vendor and warehouse ros patch, fix autoware qp interface
mini-1235 a7047c6
Fix autoware osqp interface
mini-1235 6fea97a
Restore moveit setup framework windows patch
mini-1235 24db5a9
Update ros gz bridge patch for windows
mini-1235 bd0276c
Fix swri console
mini-1235 d0fd5f6
Restore moveit ros perception patch
mini-1235 057fa85
Full rebuild
mini-1235 d66795c
enable cache and continue full rebuild
mini-1235 3bbd8dd
Try fixing robot localization on windows
mini-1235 badddf3
Generate iceroyx and cyclonedds with run deps
mini-1235 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| diff --git a/cmake/ament_python_install_module.cmake b/cmake/ament_python_install_module.cmake | ||
| index 6d61edc..ed972cf 100644 | ||
| --- a/cmake/ament_python_install_module.cmake | ||
| +++ b/cmake/ament_python_install_module.cmake | ||
| @@ -60,6 +60,7 @@ function(_ament_cmake_python_install_module module_file) | ||
| get_filename_component(module_file "${module_file}" NAME) | ||
| if(NOT ARG_SKIP_COMPILE) | ||
| get_executable_path(python_interpreter Python3::Interpreter CONFIGURE) | ||
| + string(REPLACE "\\" "/" python_interpreter "${python_interpreter}") | ||
| # compile Python files | ||
| install(CODE | ||
| "execute_process( | ||
| diff --git a/cmake/ament_python_install_registered_packages.cmake b/cmake/ament_python_install_registered_packages.cmake | ||
| index 305d92f..dd4f7de 100644 | ||
| --- a/cmake/ament_python_install_registered_packages.cmake | ||
| +++ b/cmake/ament_python_install_registered_packages.cmake | ||
| @@ -167,6 +167,7 @@ endmacro() | ||
|
|
||
| macro(_ament_cmake_python_byte_compile package_name) | ||
| get_executable_path(python_interpreter_config Python3::Interpreter CONFIGURE) | ||
| + string(REPLACE "\\" "/" python_interpreter_config "${python_interpreter_config}") | ||
| # compile Python files | ||
| install(CODE | ||
| "execute_process( |
46 changes: 46 additions & 0 deletions
46
patch/ros-rolling-autoware-behavior-velocity-planner.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| diff --git a/src/test_utils.cpp b/src/test_utils.cpp | ||
| index dc62bd6..2305a0e 100644 | ||
| --- a/src/test_utils.cpp | ||
| +++ b/src/test_utils.cpp | ||
| @@ -17 +17 @@ | ||
| -#include <ament_index_cpp/get_package_share_directory.hpp> | ||
| +#include <ament_index_cpp/get_package_share_path.hpp> | ||
| @@ -44 +44 @@ | ||
| - ament_index_cpp::get_package_share_directory("autoware_test_utils"); | ||
| + ament_index_cpp::get_package_share_path("autoware_test_utils"); | ||
| @@ -46 +46 @@ | ||
| - ament_index_cpp::get_package_share_directory("autoware_behavior_velocity_planner_common"); | ||
| + ament_index_cpp::get_package_share_path("autoware_behavior_velocity_planner_common"); | ||
| @@ -48 +48 @@ | ||
| - ament_index_cpp::get_package_share_directory("autoware_behavior_velocity_planner"); | ||
| + ament_index_cpp::get_package_share_path("autoware_behavior_velocity_planner"); | ||
| @@ -50 +50 @@ | ||
| - ament_index_cpp::get_package_share_directory("autoware_velocity_smoother"); | ||
| + ament_index_cpp::get_package_share_path("autoware_velocity_smoother"); | ||
| @@ -54 +54 @@ | ||
| - const auto package_path = ament_index_cpp::get_package_share_directory(package_name); | ||
| + const auto package_path = ament_index_cpp::get_package_share_path(package_name); | ||
| @@ -55 +55 @@ | ||
| - return package_path + "/config/" + module + ".param.yaml"; | ||
| + return (package_path / "config" / (module + ".param.yaml")).string(); | ||
| @@ -69 +69 @@ | ||
| - autoware_test_utils_dir + "/config/test_common.param.yaml", | ||
| + (autoware_test_utils_dir / "config/test_common.param.yaml").string(), | ||
| @@ -70 +70 @@ | ||
| - autoware_test_utils_dir + "/config/test_nearest_search.param.yaml", | ||
| + (autoware_test_utils_dir / "config/test_nearest_search.param.yaml").string(), | ||
| @@ -71 +71 @@ | ||
| - autoware_test_utils_dir + "/config/test_vehicle_info.param.yaml", | ||
| + (autoware_test_utils_dir / "config/test_vehicle_info.param.yaml").string(), | ||
| @@ -72 +72 @@ | ||
| - velocity_smoother_dir + "/config/default_velocity_smoother.param.yaml", | ||
| + (velocity_smoother_dir / "config/default_velocity_smoother.param.yaml").string(), | ||
| @@ -73 +73 @@ | ||
| - velocity_smoother_dir + "/config/Analytical.param.yaml", | ||
| + (velocity_smoother_dir / "config/Analytical.param.yaml").string(), | ||
| @@ -74 +74 @@ | ||
| - behavior_velocity_planner_common_dir + "/config/behavior_velocity_planner_common.param.yaml", | ||
| + (behavior_velocity_planner_common_dir / "config/behavior_velocity_planner_common.param.yaml").string(), | ||
| @@ -75 +75 @@ | ||
| - behavior_velocity_planner_dir + "/config/behavior_velocity_planner.param.yaml"}; | ||
| + (behavior_velocity_planner_dir / "config/behavior_velocity_planner.param.yaml").string()}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/src/geometry.cpp b/src/geometry.cpp | ||
| index 7d92097..d80b4ce 100644 | ||
| --- a/src/geometry.cpp | ||
| +++ b/src/geometry.cpp | ||
| @@ -17,7 +17,9 @@ | ||
| #include <autoware_utils_geometry/geometry.hpp> | ||
| #include <range/v3/all.hpp> | ||
| - | ||
| +#include <rclcpp/clock.hpp> | ||
| +#include <rclcpp/logging.hpp> | ||
| + | ||
| #include <geometry_msgs/msg/point.hpp> | ||
| #include <geometry_msgs/msg/pose.hpp> | ||
| #include <geometry_msgs/msg/quaternion.hpp> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/include/autoware/localization_util/util_func.hpp b/include/autoware/localization_util/util_func.hpp | ||
| index 4853f603..b476f2d5 100644 | ||
| --- a/include/autoware/localization_util/util_func.hpp | ||
| +++ b/include/autoware/localization_util/util_func.hpp | ||
| @@ -17,0 +18,3 @@ | ||
| +#include <rclcpp/logger.hpp> | ||
| +#include <rclcpp/time.hpp> | ||
| + | ||
| diff --git a/src/util_func.cpp b/src/util_func.cpp | ||
| index 5c7d9af3..9ee6ef75 100644 | ||
| --- a/src/util_func.cpp | ||
| +++ b/src/util_func.cpp | ||
| @@ -18,0 +19,3 @@ | ||
| +#include <rclcpp/duration.hpp> | ||
| +#include <rclcpp/logging.hpp> | ||
| + |
13 changes: 13 additions & 0 deletions
13
patch/ros-rolling-autoware-objects-of-interest-marker-interface.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/src/marker_utils.cpp b/src/marker_utils.cpp | ||
| index 0f8fa3e..42407ad 100644 | ||
| --- a/src/marker_utils.cpp | ||
| +++ b/src/marker_utils.cpp | ||
| @@ -14,6 +14,8 @@ | ||
|
|
||
| #include "autoware/objects_of_interest_marker_interface/marker_utils.hpp" | ||
|
|
||
| +#include <rclcpp/clock.hpp> | ||
| + | ||
| #include <string> | ||
|
|
||
| namespace autoware::objects_of_interest_marker_interface::marker_utils |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor, but that sounds like we should actually have
generate_dummy_package_with_run_depsfor these packages, so this kind of substitution would happen automatically (that is also the issue tracked in RoboStack/robostack.github.io#116).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, cyclonedds itself seems to have been updated and aligned with robostack builds thanks to @nmarticorena and @Tobias-Fischer (see conda-forge/cyclonedds-feedstock#16), so I wonder if we could
generate_dummy_package_with_run_depsdirectly cyclonedds?