Skip to content

Commit 6a7cd94

Browse files
Merge pull request #403 from esteve/humble-full-rebuild-20260511
Full Rebuild May 2026: bump ros2-distro-mutex to 0.9.0 and build_number to 18
2 parents d2013cd + 714fd28 commit 6a7cd94

29 files changed

Lines changed: 1668 additions & 1296 deletions

conda_build_config.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ numpy:
22
- 2 # [not emscripten]
33
- 1.26 # [emscripten]
44
assimp:
5-
- 6.0.3
5+
- 6
66
libprotobuf:
77
- 6.33.5
88
protobuf:
@@ -18,8 +18,6 @@ libxml2:
1818
- 2.14.*
1919
graphviz:
2020
- 14.*
21-
# Mitigation for
22-
# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
2321
libcap:
2422
- 2.77
2523
fmt:
@@ -76,9 +74,9 @@ cxx_compiler_version: # [unix]
7674
- 18 # [osx]
7775

7876
libzenohc:
79-
- 1.7.2
77+
- 1.9.0
8078
libzenohcxx:
81-
- 1.7.2
79+
- 1.9.0
8280

8381
libhwloc:
8482
- 2.12.2
@@ -92,3 +90,6 @@ lbr_fri_client_sdk:
9290

9391
eigen_abi_devel:
9492
- '3.4.0'
93+
94+
poco:
95+
- 1.15.2

patch/dependencies.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,21 @@ rclcpp:
188188
add_host: [ "ros-humble-yaml-cpp-vendor", "${{ 'fmt' if emscripten }}"]
189189
rclcpp_action:
190190
add_host: [ "ros-humble-yaml-cpp-vendor", "${{ 'fmt' if emscripten }}"]
191-
rsl:
192-
add_host: [ "ros-humble-tl-expected"]
193-
add_run: [ "ros-humble-tl-expected"]
191+
parameter_traits:
192+
remove_host: ["ros-humble-tl-expected"]
193+
remove_run: ["ros-humble-tl-expected"]
194+
add_host: ["cpp-expected"]
195+
add_run: ["cpp-expected"]
196+
generate_parameter_library:
197+
remove_host: ["ros-humble-tl-expected"]
198+
remove_run: ["ros-humble-tl-expected"]
199+
add_host: ["cpp-expected"]
200+
add_run: ["cpp-expected"]
201+
autoware_trajectory:
202+
remove_host: ["ros-humble-tl-expected"]
203+
remove_run: ["ros-humble-tl-expected"]
204+
add_host: ["cpp-expected"]
205+
add_run: ["cpp-expected"]
194206
imu_calib:
195207
add_host: [ "ros-humble-eigen3-cmake-module" ]
196208
add_run: [ "ros-humble-eigen3-cmake-module" ]

patch/ros-humble-ament-cmake-vendor-package.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,4 @@ index c9b963cd..2ca2f40a 100644
160160
+
161161
file(GENERATE OUTPUT "${CMAKE_ARGS_FILE}" CONTENT "${CMAKE_ARGS_CONTENT}")
162162
list(PREPEND CMAKE_ARGS "-C${CMAKE_ARGS_FILE}")
163-
163+

patch/ros-humble-autoware-ground-filter.patch

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
diff --git a/include/autoware/ground_filter/grid.hpp b/include/autoware/ground_filter/grid.hpp
2-
index b69426c..c57fe92 100644
3-
--- a/include/autoware/ground_filter/grid.hpp
4-
+++ b/include/autoware/ground_filter/grid.hpp
1+
From e7ed4e5150e3a0e34bdbb15dd1651594580f1d71 Mon Sep 17 00:00:00 2001
2+
From: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai>
3+
Date: Mon, 11 May 2026 11:42:18 +0100
4+
Subject: [PATCH] fix(autoware_ground_filter): add M_PIf fallback defines for
5+
Linux
6+
7+
Signed-off-by: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai>
8+
---
9+
src/grid.hpp | 6 ++++++
10+
1 file changed, 6 insertions(+)
11+
12+
diff --git a/src/grid.hpp b/src/grid.hpp
13+
index 8157550b..57d65180 100644
14+
--- a/src/grid.hpp
15+
+++ b/src/grid.hpp
516
@@ -25,6 +25,12 @@
617
#include <utility>
718
#include <vector>
@@ -15,3 +26,6 @@ index b69426c..c57fe92 100644
1526
namespace
1627
{
1728

29+
--
30+
2.54.0
31+

patch/ros-humble-autoware-map-height-fitter.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

patch/ros-humble-autoware-ndt-scan-matcher.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ index 57c25aa..01eb4e7 100644
2121
-#include <pcl/filters/boost.h>
2222

2323
#include <limits>
24-
#include <map>
24+
#include <map>

patch/ros-humble-autoware-path-generator.osx.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

patch/ros-humble-autoware-test-utils.patch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ index eb50d67..6be3b86 100644
2020
ament_auto_add_executable(topic_snapshot_saver src/topic_snapshot_saver.cpp)
2121

2222
target_link_libraries(topic_snapshot_saver autoware_test_utils yaml-cpp::yaml-cpp)
23+
Lines changed: 83 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,85 @@
1-
diff --git a/common/autoware_trajectory/CMakeLists.txt b/common/autoware_trajectory/CMakeLists.txt
2-
index 4c3275d32a..4aae06a991 100644
3-
--- a/common/autoware_trajectory/CMakeLists.txt
4-
+++ b/common/autoware_trajectory/CMakeLists.txt
5-
@@ -44,6 +44,7 @@ ament_auto_add_library(autoware_trajectory SHARED
6-
src/utils/footprint.cpp
7-
src/utils/velocity.cpp
8-
)
9-
+target_link_libraries(autoware_trajectory fmt::fmt)
10-
11-
if(BUILD_TESTING)
12-
ament_auto_find_test_dependencies()
13-
diff --git a/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp b/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
14-
index e339508816..c010fa633a 100644
15-
--- a/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
16-
+++ b/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp
17-
@@ -19,6 +19,7 @@
18-
19-
#include <rclcpp/logging.hpp>
20-
21-
+#include <algorithm>
1+
From c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d Mon Sep 17 00:00:00 2001
2+
From: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai>
3+
Date: Mon, 11 May 2026 14:24:03 +0100
4+
Subject: [PATCH] fix(autoware_trajectory): migrate tl_expected to libexpected-dev
5+
6+
Signed-off-by: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai>
7+
---
8+
include/autoware/trajectory/interpolator/result.hpp | 2 +-
9+
include/autoware/trajectory/temporal_trajectory.hpp | 2 +-
10+
include/autoware/trajectory/utils/reference_path.hpp | 2 +-
11+
include/autoware/trajectory/utils/shift.hpp | 2 +-
12+
package.xml | 2 +-
13+
5 files changed, 5 insertions(+), 5 deletions(-)
14+
15+
diff --git a/include/autoware/trajectory/interpolator/result.hpp b/include/autoware/trajectory/interpolator/result.hpp
16+
index 5ea3257..f06b16e 100644
17+
--- a/include/autoware/trajectory/interpolator/result.hpp
18+
+++ b/include/autoware/trajectory/interpolator/result.hpp
19+
@@ -15,7 +15,7 @@
20+
#ifndef AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_
21+
#define AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_
22+
23+
-#include <tl_expected/expected.hpp>
24+
+#include <tl/expected.hpp>
25+
26+
#include <string>
27+
28+
diff --git a/include/autoware/trajectory/temporal_trajectory.hpp b/include/autoware/trajectory/temporal_trajectory.hpp
29+
index 443d407..4fe6b2a 100644
30+
--- a/include/autoware/trajectory/temporal_trajectory.hpp
31+
+++ b/include/autoware/trajectory/temporal_trajectory.hpp
32+
@@ -18,7 +18,7 @@
33+
#include "autoware/trajectory/detail/time_distance_mapping.hpp"
34+
#include "autoware/trajectory/trajectory_point.hpp"
35+
36+
-#include <tl_expected/expected.hpp>
37+
+#include <tl/expected.hpp>
38+
39+
#include <memory>
40+
#include <utility>
41+
diff --git a/include/autoware/trajectory/utils/reference_path.hpp b/include/autoware/trajectory/utils/reference_path.hpp
42+
index df92ef9..bf52e8c 100644
43+
--- a/include/autoware/trajectory/utils/reference_path.hpp
44+
+++ b/include/autoware/trajectory/utils/reference_path.hpp
45+
@@ -17,7 +17,7 @@
46+
47+
#include "autoware/trajectory/forward.hpp"
48+
49+
-#include <tl_expected/expected.hpp>
50+
+#include <tl/expected.hpp>
51+
52+
#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
53+
54+
diff --git a/include/autoware/trajectory/utils/shift.hpp b/include/autoware/trajectory/utils/shift.hpp
55+
index 552cbed..1c64049 100644
56+
--- a/include/autoware/trajectory/utils/shift.hpp
57+
+++ b/include/autoware/trajectory/utils/shift.hpp
58+
@@ -19,7 +19,7 @@
59+
#include "autoware/trajectory/forward.hpp"
60+
61+
#include <range/v3/view/zip.hpp>
62+
-#include <tl_expected/expected.hpp>
63+
+#include <tl/expected.hpp>
64+
65+
#include <string>
2266
#include <utility>
23-
#include <vector>
67+
diff --git a/package.xml b/package.xml
68+
index b49e295..c5f5a10 100644
69+
--- a/package.xml
70+
+++ b/package.xml
71+
@@ -28,11 +28,11 @@
72+
<depend>fmt</depend>
73+
<depend>geometry_msgs</depend>
74+
<depend>lanelet2_core</depend>
75+
+ <depend>libexpected-dev</depend>
76+
<depend>rclcpp</depend>
77+
<depend>tf2</depend>
78+
<depend>tf2_geometry_msgs</depend>
79+
- <depend>tl_expected</depend>
2480

81+
<test_depend>ament_cmake_auto</test_depend>
82+
<test_depend>ament_index_cpp</test_depend>
83+
--
84+
2.54.0
85+

patch/ros-humble-autoware-trajectory.win.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ diff --git a/common/autoware_trajectory/include/autoware/trajectory/utils/pretty
2020
-#include <range/v3/view/drop.hpp>
2121
-#include <range/v3/view/transform.hpp>
2222
-#include <range/v3/view/zip_with.hpp>
23-
#include <tl_expected/expected.hpp>
23+
#include <tl/expected.hpp>
2424

2525
#include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp>
2626
#include <autoware_planning_msgs/msg/path.hpp>
@@ -134,8 +134,8 @@ diff --git a/common/autoware_trajectory/include/autoware/trajectory/utils/shift.
134134
#include "autoware/trajectory/forward.hpp"
135135

136136
-#include <range/v3/view/zip.hpp>
137-
#include <tl_expected/expected.hpp>
138-
137+
#include <tl/expected.hpp>
138+
139139
#include <string>
140140
@@ -119,8 +118,9 @@ tl::expected<trajectory::Trajectory<PointType>, ShiftError> shift(
141141
// Apply shift.

0 commit comments

Comments
 (0)