Skip to content
Open
Show file tree
Hide file tree
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 Jul 30, 2026
645182c
Drop obsolete upstreamed patches
mini-1235 Jul 30, 2026
7a41366
Fix Autoware rolling CI patches
mini-1235 Jul 30, 2026
2de5633
Fix remaining Autoware test utils patch hunk
mini-1235 Jul 30, 2026
0f0889f
Fix Autoware lanelet2 utils rclcpp includes
mini-1235 Jul 30, 2026
25cd62a
Fix additional Autoware rolling includes
mini-1235 Jul 30, 2026
eea4280
Fix Autoware velocity smoother rclcpp ok include
mini-1235 Jul 30, 2026
ff7f0fa
Fix Autoware behavior velocity planner share paths
mini-1235 Jul 30, 2026
7a474fe
Fix Autoware path generator rclcpp ok include
mini-1235 Jul 30, 2026
691653a
Fix MoveIt ament index API usage
mini-1235 Jul 30, 2026
1e85be5
Fix MoveIt ROS control interface include
mini-1235 Jul 30, 2026
583a64d
Fix tf2 node argument patches
mini-1235 Jul 30, 2026
15ae0b4
Fix moveit
mini-1235 Jul 31, 2026
aa1e05c
Fix tf2 node interface patches
mini-1235 Aug 1, 2026
3d3ab20
Fix laser filter, ur controller and pytree
mini-1235 Aug 1, 2026
17c758e
Fix plotjuggler and autoware ekf
mini-1235 Aug 1, 2026
c4f4dc2
Bump stdlib version to 13.3 for osx
mini-1235 Aug 1, 2026
c5fb9ba
Fix plotjuggler and odom to tf
mini-1235 Aug 1, 2026
83c24e7
Fix moveit ros perception and rviz satellite
mini-1235 Aug 1, 2026
da67a6e
Bump protobuf to 7.35.1
mini-1235 Aug 1, 2026
91a3dfa
Fix pointcloud to laserscan and ouster ros
mini-1235 Aug 1, 2026
d325cbc
Bump versions and disable cache
mini-1235 Aug 2, 2026
99d2a84
Fix dependency conflict, add patches for turtlesim and rosgraph monitor
mini-1235 Aug 3, 2026
d7b68a1
Bump vinca and enable cache
mini-1235 Aug 4, 2026
3c0ab9e
Use Vinca package_name_mode=both
mini-1235 Aug 4, 2026
46aad74
Unvendor iceoryx
mini-1235 Aug 8, 2026
0a06c91
Unpin cmake and disable cache
mini-1235 Aug 10, 2026
a3577e9
Fix pixi warnings, try adding ament-cmake-python patch for windows
mini-1235 Aug 10, 2026
9af6e52
Fix mrt cmake version and enable cache
mini-1235 Aug 10, 2026
737a127
Fix osqp cmake version and disable cache
mini-1235 Aug 10, 2026
25f3161
Patch lanelet2 and enable cache
mini-1235 Aug 11, 2026
d65cbb7
Remove cm executors as it is merged in rclcpp
mini-1235 Aug 12, 2026
f8ad463
Remove nav2 patches as they are outdated and not building in rolling
mini-1235 Aug 12, 2026
de26c08
Remove rclcpp win patch as it is merged upstream
mini-1235 Aug 12, 2026
dc681aa
Update vinca to latest version
mini-1235 Aug 13, 2026
deb10cf
Update rosidl generator py patch
mini-1235 Aug 16, 2026
8310501
Refresh snapshot again 0816
mini-1235 Aug 16, 2026
de8db65
Remove osqp vendor and warehouse ros patch, fix autoware qp interface
mini-1235 Aug 16, 2026
a7047c6
Fix autoware osqp interface
mini-1235 Aug 16, 2026
6fea97a
Restore moveit setup framework windows patch
mini-1235 Aug 16, 2026
24db5a9
Update ros gz bridge patch for windows
mini-1235 Aug 17, 2026
bd0276c
Fix swri console
mini-1235 Aug 17, 2026
d0fd5f6
Restore moveit ros perception patch
mini-1235 Aug 17, 2026
057fa85
Full rebuild
mini-1235 Aug 17, 2026
d66795c
enable cache and continue full rebuild
mini-1235 Aug 18, 2026
3bbd8dd
Try fixing robot localization on windows
mini-1235 Aug 19, 2026
badddf3
Generate iceroyx and cyclonedds with run deps
mini-1235 Aug 19, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ jobs:
shell: bash -l {0}
run: |
# rm -rf ${{ matrix.folder_cache }}/ros-rolling-moveit-ros-perception* 2>/dev/null || true
rm -rf ${{ matrix.folder_cache }}/ros-rolling-cyclonedds* 2>/dev/null || true
rm -rf ${{ matrix.folder_cache }}/ros-rolling-rmw-cyclonedds* 2>/dev/null || true
rm -rf ${{ matrix.folder_cache }}/ros-rolling-iceoryx* 2>/dev/null || true
mkdir -p ${{ matrix.folder_cache }}
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force

Expand Down
25 changes: 10 additions & 15 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ numpy:
assimp:
- 6.0.5
libprotobuf:
- 6.33.5
- 7.35.1
protobuf:
- 6.33.5
- 7.35.1
spdlog:
- 1.17
pugixml:
Expand All @@ -19,24 +19,19 @@ graphviz:
# Mitigation for
# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
libcap:
- 2.77
- 2.78
fmt:
- 12.1
lua:
- 5.4
tbb:
- '2022'
- '2023'
tbb_devel:
- '2022'

# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
cmake:
- 3.*
- '2023'

eigen_abi_devel:
- 5.0.1


cdt_name: # [linux]
- conda # [linux]

Expand All @@ -51,27 +46,27 @@ c_compiler:
- vs2022 # [win]
c_compiler_version: # [unix]
- 14 # [linux]
- 18 # [osx]
- 19 # [osx]
c_stdlib:
- sysroot # [linux]
- macosx_deployment_target # [osx]
- vs # [win]
c_stdlib_version: # [unix]
- 2.28 # [linux]
- 11.0 # [osx and x86_64]
- 11.0 # [osx and arm64]
- 14.0 # [osx and x86_64]
- 14.0 # [osx and arm64]
cxx_compiler:
- gxx # [linux]
- clangxx # [osx]
- vs2022 # [win]
cxx_compiler_version: # [unix]
- 14 # [linux]
- 18 # [osx]
- 19 # [osx]

libzenohc:
- 1.9.0
libzenohcxx:
- 1.9.0

libhwloc:
- 2.12.2
- 2.13.0
21 changes: 11 additions & 10 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,6 @@ rtabmap:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "ceres-solver", "libdc1394", "libusb", "vtk"]
backward_ros:
add_host: ["${{ 'binutils' if linux }}", "${{ 'elfutils' if linux }}", "ros-rolling-ament-cmake-libraries"]
nav2_smac_planner:
add_build: ["${{ 'llvm-openmp' if osx }}"]
add_host: ["${{ 'llvm-openmp' if osx }}", "ompl", "libode"]
nav2_util:
add_host: ["libboost-devel"]
nav2_constrained_smoother:
add_host: ["${{ 'openblas' if win }}", "ceres-solver * cpu*"]
nav2_mppi_controller:
add_build: ["${{ 'clang <19' if osx }}"]
ompl:
add_host: ["ompl"]
pybind11_vendor:
Expand Down Expand Up @@ -155,6 +146,16 @@ force_torque_sensor_broadcaster:
add_host: ["typeguard", "jinja2"]
ros_gz_sim:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "ros-rolling-gz-sensors-vendor"]
cyclonedds:
add_host: ["libiceoryx-hoofs-devel", "libiceoryx-posh-devel", "iceoryx"]
add_run: ["libiceoryx-hoofs", "libiceoryx-posh"]
remove_host: ["ros-rolling-iceoryx-hoofs", "ros-rolling-iceoryx-posh"]
remove_run: ["ros-rolling-iceoryx-hoofs", "ros-rolling-iceoryx-posh"]
rmw_cyclonedds_cpp:
add_host: ["libiceoryx-binding-c-devel"]
add_run: ["libiceoryx-binding-c"]
remove_host: ["ros-rolling-iceoryx-binding-c"]
remove_run: ["ros-rolling-iceoryx-binding-c"]
Comment on lines +149 to +158

Copy link
Copy Markdown
Member

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_deps for these packages, so this kind of substitution would happen automatically (that is also the issue tracked in RoboStack/robostack.github.io#116).

Copy link
Copy Markdown
Member

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_deps directly cyclonedds?

geometric_shapes:
add_host: ["libboost-devel", "octomap"]
ros_image_to_qimage:
Expand Down Expand Up @@ -283,7 +284,7 @@ grid_map_octomap:
add_host: ["octomap"]
add_run: ["octomap"]
py_trees:
add_host: ["poetry-core"]
add_host: ["hatchling"]
py_trees_js:
add_host: ["poetry-core"]
py_trees_ros:
Expand Down
24 changes: 24 additions & 0 deletions patch/ros-rolling-ament-cmake-python.patch
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 patch/ros-rolling-autoware-behavior-velocity-planner.patch
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()};
15 changes: 15 additions & 0 deletions patch/ros-rolling-autoware-ekf-localizer.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,18 @@ index 6ace0b4..5781ddc 100644

function(add_testcase filepath)
get_filename_component(filename ${filepath} NAME)
diff --git a/src/ekf_localizer.cpp b/src/ekf_localizer.cpp
index 77dbddc..e34f765 100644
--- a/src/ekf_localizer.cpp
+++ b/src/ekf_localizer.cpp
@@ -96,8 +96,7 @@ EKFLocalizer::EKFLocalizer(const rclcpp::NodeOptions & node_options)
std::bind(
&EKFLocalizer::service_trigger_node, this, std::placeholders::_1, std::placeholders::_2),
service_trigger_qos);

- tf_br_ = std::make_shared<tf2_ros::TransformBroadcaster>(
- std::shared_ptr<rclcpp::Node>(this, [](auto) {}));
+ tf_br_ = std::make_shared<tf2_ros::TransformBroadcaster>(*this);

ekf_module_ = std::make_unique<EKFModule>(warning_, params_);
logger_configure_ = std::make_unique<autoware_utils_logging::LoggerLevelConfigure>(this);
14 changes: 14 additions & 0 deletions patch/ros-rolling-autoware-lanelet2-utils.patch
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>
16 changes: 16 additions & 0 deletions patch/ros-rolling-autoware-localization-util.patch
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>
+
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
Loading