Skip to content

Commit 84a93ff

Browse files
wep21wep21
authored
Merge pull request #10 from RoboStack/fullrebuild-202605-2
Full rebuild May 2026 bump ros2-distro-mutex to 0.16.0 and build number to 20
2 parents 2a94af5 + 2cc1342 commit 84a93ff

13 files changed

Lines changed: 1519 additions & 1303 deletions

‎.github/workflows/testpr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: Delete specific outdated cache entries
102102
shell: bash -l {0}
103103
run: |
104-
# rm -rf ${{ matrix.folder_cache }}/ros-rolling-rviz-visual-tools* 2>/dev/null || true
104+
# rm -rf ${{ matrix.folder_cache }}/ros-rolling-moveit-setup-srdf-plugins* 2>/dev/null || true
105105
mkdir -p ${{ matrix.folder_cache }}
106106
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force
107107

‎patch/dependencies.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,13 @@ autoware_utils_pcl:
255255
autoware_utils_debug:
256256
add_host: ["fmt"]
257257
autoware_trajectory:
258-
add_host: ["fmt"]
258+
add_host: ["fmt", "cpp-expected"]
259+
autoware_behavior_velocity_planner:
260+
add_host: ["cpp-expected"]
261+
autoware_behavior_velocity_planner_common:
262+
add_host: ["cpp-expected"]
263+
autoware_behavior_velocity_stop_line_module:
264+
add_host: ["cpp-expected"]
259265
rclpy:
260266
add_host: ["typing_extensions"]
261267
add_run: ["typing_extensions"]

‎patch/ros-rolling-autoware-trajectory.patch‎

Lines changed: 83 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index ce27aa99..1cecb42e 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -44,6 +44,10 @@ ament_auto_add_library(autoware_trajectory SHARED
6+
src/utils/velocity.cpp
7+
)
8+
9+
+target_link_libraries(autoware_trajectory
10+
+ fmt::fmt
11+
+)
12+
+
13+
if(BUILD_TESTING)
14+
ament_auto_find_test_dependencies()
15+
116
diff --git a/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp b/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
2-
index e339508816..67faba08c8 100644
17+
index e3395088..67faba08 100644
318
--- a/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
419
+++ b/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
520
@@ -21,6 +21,7 @@
@@ -11,7 +26,7 @@ index e339508816..67faba08c8 100644
1126
namespace autoware::experimental::trajectory::interpolator::detail
1227
{
1328
diff --git a/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp b/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp
14-
index b2ce72b..35ba18f 100644
29+
index b2ce72bd..35ba18f5 100644
1530
--- a/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp
1631
+++ b/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp
1732
@@ -21,6 +21,12 @@
@@ -27,21 +42,74 @@ index b2ce72b..35ba18f 100644
2742
namespace autoware::experimental::trajectory::interpolator
2843
{
2944

30-
diff --git a/CMakeLists.txt b/CMakeLists.txt
31-
index 6ca7cd4..8490283 100644
32-
--- a/CMakeLists.txt
33-
+++ b/CMakeLists.txt
34-
@@ -42,6 +42,10 @@ ament_auto_add_library(autoware_trajectory SHARED
35-
src/utils/velocity.cpp
36-
)
45+
diff --git a/include/autoware/trajectory/interpolator/result.hpp b/include/autoware/trajectory/interpolator/result.hpp
46+
index 5ea32574..38a4ba9d 100644
47+
--- a/include/autoware/trajectory/interpolator/result.hpp
48+
+++ b/include/autoware/trajectory/interpolator/result.hpp
49+
@@ -15,7 +15,7 @@
50+
#ifndef AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_
51+
#define AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_
3752

38-
+target_link_libraries(autoware_trajectory
39-
+ fmt::fmt
40-
+)
41-
+
42-
if(BUILD_TESTING)
43-
ament_auto_find_test_dependencies()
53+
-#include <tl_expected/expected.hpp>
54+
+#include <tl/expected.hpp>
55+
56+
#include <string>
57+
58+
diff --git a/include/autoware/trajectory/utils/pretty_build.hpp b/include/autoware/trajectory/utils/pretty_build.hpp
59+
index 3f0e756f..46686f99 100644
60+
--- a/include/autoware/trajectory/utils/pretty_build.hpp
61+
+++ b/include/autoware/trajectory/utils/pretty_build.hpp
62+
@@ -28,7 +28,7 @@
63+
#include <range/v3/view/drop.hpp>
64+
#include <range/v3/view/transform.hpp>
65+
#include <range/v3/view/zip_with.hpp>
66+
-#include <tl_expected/expected.hpp>
67+
+#include <tl/expected.hpp>
68+
69+
#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
70+
#include <autoware_planning_msgs/msg/path.hpp>
71+
diff --git a/include/autoware/trajectory/utils/reference_path.hpp b/include/autoware/trajectory/utils/reference_path.hpp
72+
index df92ef97..e5a4ca05 100644
73+
--- a/include/autoware/trajectory/utils/reference_path.hpp
74+
+++ b/include/autoware/trajectory/utils/reference_path.hpp
75+
@@ -17,7 +17,7 @@
76+
77+
#include "autoware/trajectory/forward.hpp"
78+
79+
-#include <tl_expected/expected.hpp>
80+
+#include <tl/expected.hpp>
81+
82+
#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
83+
84+
diff --git a/include/autoware/trajectory/utils/shift.hpp b/include/autoware/trajectory/utils/shift.hpp
85+
index 552cbed6..2ae854b6 100644
86+
--- a/include/autoware/trajectory/utils/shift.hpp
87+
+++ b/include/autoware/trajectory/utils/shift.hpp
88+
@@ -19,7 +19,7 @@
89+
#include "autoware/trajectory/forward.hpp"
90+
91+
#include <range/v3/view/zip.hpp>
92+
-#include <tl_expected/expected.hpp>
93+
+#include <tl/expected.hpp>
94+
95+
#include <string>
96+
#include <utility>
97+
diff --git a/package.xml b/package.xml
98+
index ce32e58e..3eda3284 100644
99+
--- a/package.xml
100+
+++ b/package.xml
101+
@@ -26,10 +26,10 @@
102+
<depend>fmt</depend>
103+
<depend>geometry_msgs</depend>
104+
<depend>lanelet2_core</depend>
105+
+ <depend>libexpected-dev</depend>
106+
<depend>rclcpp</depend>
107+
<depend>tf2</depend>
108+
<depend>tf2_geometry_msgs</depend>
109+
- <depend>tl_expected</depend>
110+
<depend>yaml-cpp</depend>
44111

112+
<test_depend>ament_cmake_auto</test_depend>
45113
diff --git a/src/utils/reference_path.cpp b/src/utils/reference_path.cpp
46114
index b8beb1b8..db8aec3f 100644
47115
--- a/src/utils/reference_path.cpp

‎patch/ros-rolling-cm-executors.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,16 @@ index 4fd2330..e455141 100644
1111
// clear on reset callback
1212
if(rcl_timer_set_on_reset_callback(timer_data->rcl_ref.get(), nullptr,
1313
nullptr) != RCL_RET_OK)
14+
diff --git a/include/cm_executors/events_cbg_executor.hpp b/include/cm_executors/events_cbg_executor.hpp
15+
index 3009afe..6ded674 100644
16+
--- a/include/cm_executors/events_cbg_executor.hpp
17+
+++ b/include/cm_executors/events_cbg_executor.hpp
18+
@@ -25,7 +25,7 @@
19+
20+
#include "rclcpp/executor.hpp"
21+
#include "rclcpp/macros.hpp"
22+
-#include "rclcpp/memory_strategies.hpp"
23+
+#include "rclcpp/memory_strategy.hpp"
24+
#include "rclcpp/visibility_control.hpp"
25+
26+
namespace rclcpp

0 commit comments

Comments
 (0)