Skip to content

Commit 393a104

Browse files
authored
Merge pull request #54 from wep21/rebuild-202504
Full Rebuild June 2025: bump ros2-distro-mutex to 0.9.0 and build_number to 7
2 parents 09fd4dd + 47ebdf4 commit 393a104

28 files changed

+1702
-2322
lines changed

.github/workflows/testpr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
3838
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
3939

40-
- uses: prefix-dev/[email protected].1
40+
- uses: prefix-dev/[email protected].8
4141
with:
42-
pixi-version: v0.41.1
42+
pixi-version: v0.44.0
4343
environments: beta
4444
frozen: true
4545

additional_recipes/ros2-distro-mutex/recipe.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: ros2-distro-mutex
3-
version: 0.8.0
3+
version: 0.9.0
44

55
build:
66
number: 0
@@ -30,10 +30,11 @@ requirements:
3030
run_constraints:
3131
- libboost 1.86.*
3232
- libboost-devel 1.86.*
33-
- pcl 1.14.1.*
33+
- pcl 1.15.0.*
3434
- gazebo 11.*
3535
- libprotobuf 5.29.3.*
3636
- libxml2 2.13.*
37+
- vtk 9.4.2.*
3738

3839
run_exports:
3940
weak:

conda_build_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ cxx_compiler_version: # [unix]
5151
- 18 # [osx]
5252

5353
libzenohc:
54-
- 1.2.1
54+
- 1.3.4
5555
libzenohcxx:
56-
- 1.2.1
56+
- 1.3.4
5757
libcap:
5858
- 2.71

patch/dependencies.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,7 @@ zenoh_cpp_vendor:
239239
add_host: ["libzenohc", "libzenohcxx"]
240240
rmw_zenoh_cpp:
241241
add_host: ["libzenohc", "libzenohcxx"]
242+
autoware_utils_pcl:
243+
add_host: ["REQUIRE_OPENGL"]
244+
autoware_utils_debug:
245+
add_host: ["fmt"]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/cmake/autoware_package.cmake b/cmake/autoware_package.cmake
2+
index 2f46006..3d63a70 100644
3+
--- a/cmake/autoware_package.cmake
4+
+++ b/cmake/autoware_package.cmake
5+
@@ -78,6 +78,11 @@ macro(autoware_package)
6+
)
7+
endif()
8+
9+
+ if(MSVC)
10+
+ add_compile_definitions(_USE_MATH_DEFINES)
11+
+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
12+
+ endif()
13+
+
14+
# Find test dependencies
15+
if(BUILD_TESTING)
16+
find_package(ament_lint_auto REQUIRED)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/autoware_utils_debug/CMakeLists.txt b/autoware_utils_debug/CMakeLists.txt
2+
index a823eda..92f0906 100644
3+
--- a/autoware_utils_debug/CMakeLists.txt
4+
+++ b/autoware_utils_debug/CMakeLists.txt
5+
@@ -2,11 +2,13 @@ cmake_minimum_required(VERSION 3.14)
6+
project(autoware_utils_debug)
7+
8+
find_package(autoware_cmake REQUIRED)
9+
+find_package(fmt REQUIRED)
10+
autoware_package()
11+
12+
ament_auto_add_library(${PROJECT_NAME} SHARED
13+
"src/time_keeper.cpp"
14+
)
15+
+target_link_libraries(${PROJECT_NAME} fmt::fmt)
16+
17+
if(BUILD_TESTING)
18+
file(GLOB_RECURSE test_files test/*.cpp)
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
diff --git a/src/backtrace.cpp b/src/backtrace.cpp
2+
index 3bdfa8f..ee27f35 100644
3+
--- a/src/backtrace.cpp
4+
+++ b/src/backtrace.cpp
5+
@@ -16,7 +16,9 @@
6+
7+
#include <rclcpp/rclcpp.hpp>
8+
9+
+#if !defined(_MSC_VER)
10+
#include <execinfo.h>
11+
+#endif
12+
13+
#include <iostream>
14+
#include <memory>
15+
@@ -29,6 +31,7 @@ namespace autoware_utils_system
16+
// cppcheck-suppress unusedFunction
17+
void print_backtrace()
18+
{
19+
+#if !defined(_MSC_VER)
20+
constexpr size_t max_frames = 100;
21+
void * addrlist[max_frames + 1];
22+
23+
@@ -49,5 +52,9 @@ void print_backtrace()
24+
25+
free(symbol_list);
26+
}
27+
+#else
28+
+ return;
29+
+}
30+
+#endif
31+
32+
} // namespace autoware_utils_system

patch/ros-jazzy-behaviortree-cpp.patch

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

patch/ros-jazzy-behaviortree-cpp.win.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/controller_interface_base.cpp b/src/controller_interface_base.cpp
2+
index 532544ab3..22229eb8a 100644
3+
--- a/src/controller_interface_base.cpp
4+
+++ b/src/controller_interface_base.cpp
5+
@@ -153,7 +153,7 @@ const rclcpp_lifecycle::State & ControllerInterfaceBase::configure()
6+
{
7+
RCLCPP_WARN(
8+
get_node()->get_logger(),
9+
- "The update rate of the controller : '%ld Hz' cannot be higher than the update rate of the "
10+
+ "The update rate of the controller : '%lld Hz' cannot be higher than the update rate of the "
11+
"controller manager : '%d Hz'. Setting it to the update rate of the controller manager.",
12+
update_rate, update_rate_);
13+
}

0 commit comments

Comments
 (0)