Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Delete specific outdated cache entries
shell: bash -l {0}
run: |
# rm -rf ${{ matrix.folder_cache }}/ros-rolling-rviz-visual-tools* 2>/dev/null || true
# rm -rf ${{ matrix.folder_cache }}/ros-rolling-moveit-setup-srdf-plugins* 2>/dev/null || true
mkdir -p ${{ matrix.folder_cache }}
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force

Expand Down
8 changes: 7 additions & 1 deletion patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,13 @@ autoware_utils_pcl:
autoware_utils_debug:
add_host: ["fmt"]
autoware_trajectory:
add_host: ["fmt"]
add_host: ["fmt", "cpp-expected"]
autoware_behavior_velocity_planner:
add_host: ["cpp-expected"]
autoware_behavior_velocity_planner_common:
add_host: ["cpp-expected"]
autoware_behavior_velocity_stop_line_module:
add_host: ["cpp-expected"]
rclpy:
add_host: ["typing_extensions"]
add_run: ["typing_extensions"]
Expand Down
98 changes: 83 additions & 15 deletions patch/ros-rolling-autoware-trajectory.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce27aa99..1cecb42e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,10 @@ ament_auto_add_library(autoware_trajectory SHARED
src/utils/velocity.cpp
)

+target_link_libraries(autoware_trajectory
+ fmt::fmt
+)
+
if(BUILD_TESTING)
ament_auto_find_test_dependencies()

diff --git a/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp b/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
index e339508816..67faba08c8 100644
index e3395088..67faba08 100644
--- a/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
+++ b/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
@@ -21,6 +21,7 @@
Expand All @@ -11,7 +26,7 @@ index e339508816..67faba08c8 100644
namespace autoware::experimental::trajectory::interpolator::detail
{
diff --git a/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp b/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp
index b2ce72b..35ba18f 100644
index b2ce72bd..35ba18f5 100644
--- a/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp
+++ b/include/autoware/trajectory/interpolator/lane_ids_interpolator.hpp
@@ -21,6 +21,12 @@
Expand All @@ -27,21 +42,74 @@ index b2ce72b..35ba18f 100644
namespace autoware::experimental::trajectory::interpolator
{

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ca7cd4..8490283 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,10 @@ ament_auto_add_library(autoware_trajectory SHARED
src/utils/velocity.cpp
)
diff --git a/include/autoware/trajectory/interpolator/result.hpp b/include/autoware/trajectory/interpolator/result.hpp
index 5ea32574..38a4ba9d 100644
--- a/include/autoware/trajectory/interpolator/result.hpp
+++ b/include/autoware/trajectory/interpolator/result.hpp
@@ -15,7 +15,7 @@
#ifndef AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_
#define AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_

+target_link_libraries(autoware_trajectory
+ fmt::fmt
+)
+
if(BUILD_TESTING)
ament_auto_find_test_dependencies()
-#include <tl_expected/expected.hpp>
+#include <tl/expected.hpp>

#include <string>

diff --git a/include/autoware/trajectory/utils/pretty_build.hpp b/include/autoware/trajectory/utils/pretty_build.hpp
index 3f0e756f..46686f99 100644
--- a/include/autoware/trajectory/utils/pretty_build.hpp
+++ b/include/autoware/trajectory/utils/pretty_build.hpp
@@ -28,7 +28,7 @@
#include <range/v3/view/drop.hpp>
#include <range/v3/view/transform.hpp>
#include <range/v3/view/zip_with.hpp>
-#include <tl_expected/expected.hpp>
+#include <tl/expected.hpp>

#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
#include <autoware_planning_msgs/msg/path.hpp>
diff --git a/include/autoware/trajectory/utils/reference_path.hpp b/include/autoware/trajectory/utils/reference_path.hpp
index df92ef97..e5a4ca05 100644
--- a/include/autoware/trajectory/utils/reference_path.hpp
+++ b/include/autoware/trajectory/utils/reference_path.hpp
@@ -17,7 +17,7 @@

#include "autoware/trajectory/forward.hpp"

-#include <tl_expected/expected.hpp>
+#include <tl/expected.hpp>

#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>

diff --git a/include/autoware/trajectory/utils/shift.hpp b/include/autoware/trajectory/utils/shift.hpp
index 552cbed6..2ae854b6 100644
--- a/include/autoware/trajectory/utils/shift.hpp
+++ b/include/autoware/trajectory/utils/shift.hpp
@@ -19,7 +19,7 @@
#include "autoware/trajectory/forward.hpp"

#include <range/v3/view/zip.hpp>
-#include <tl_expected/expected.hpp>
+#include <tl/expected.hpp>

#include <string>
#include <utility>
diff --git a/package.xml b/package.xml
index ce32e58e..3eda3284 100644
--- a/package.xml
+++ b/package.xml
@@ -26,10 +26,10 @@
<depend>fmt</depend>
<depend>geometry_msgs</depend>
<depend>lanelet2_core</depend>
+ <depend>libexpected-dev</depend>
<depend>rclcpp</depend>
<depend>tf2</depend>
<depend>tf2_geometry_msgs</depend>
- <depend>tl_expected</depend>
<depend>yaml-cpp</depend>

<test_depend>ament_cmake_auto</test_depend>
diff --git a/src/utils/reference_path.cpp b/src/utils/reference_path.cpp
index b8beb1b8..db8aec3f 100644
--- a/src/utils/reference_path.cpp
Expand Down
13 changes: 13 additions & 0 deletions patch/ros-rolling-cm-executors.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,16 @@ index 4fd2330..e455141 100644
// clear on reset callback
if(rcl_timer_set_on_reset_callback(timer_data->rcl_ref.get(), nullptr,
nullptr) != RCL_RET_OK)
diff --git a/include/cm_executors/events_cbg_executor.hpp b/include/cm_executors/events_cbg_executor.hpp
index 3009afe..6ded674 100644
--- a/include/cm_executors/events_cbg_executor.hpp
+++ b/include/cm_executors/events_cbg_executor.hpp
@@ -25,7 +25,7 @@

#include "rclcpp/executor.hpp"
#include "rclcpp/macros.hpp"
-#include "rclcpp/memory_strategies.hpp"
+#include "rclcpp/memory_strategy.hpp"
#include "rclcpp/visibility_control.hpp"

namespace rclcpp
Loading