Skip to content

Commit bc912bf

Browse files
authored
Fix Windows build: clear broken chomp-motion-planner cache + apply PR #81 changes
1 parent d4750b5 commit bc912bf

24 files changed

Lines changed: 336 additions & 106 deletions

.github/workflows/testpr.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ jobs:
101101
- name: Delete specific outdated cache entries
102102
shell: bash -l {0}
103103
run: |
104-
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-rosx* 2>/dev/null || true
104+
rm -rf ${{ matrix.folder_cache }}/ros-kilted-mrt-cmake-modules* 2>/dev/null || true
105+
# chomp-motion-planner can end up as an incomplete package in the cache if a previous
106+
# Windows run was cancelled mid-build; force a fresh rebuild to ensure cmake configs
107+
# are properly installed
108+
rm -rf ${{ matrix.folder_cache }}/ros-kilted-chomp-motion-planner* 2>/dev/null || true
105109
mkdir -p ${{ matrix.folder_cache }}
106110
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force
107111

build_gap_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def main() -> int:
143143
print()
144144
missing = recipes - built
145145
print(
146-
f"Recipe directories without built artifact on this platform: "
146+
f"Recipe directories without built artifact on {platform} platform: "
147147
f"{len(missing)} out of {len(recipes)}"
148148
)
149149
if missing:

conda_build_config.yaml

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,56 @@
11
numpy:
22
- 2
3+
34
assimp:
4-
- 5
5+
- 6
6+
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
7+
cmake:
8+
- 3.*
9+
eigen_abi_devel:
10+
- '5.0.1'
511
libprotobuf:
612
- 6.33.5
713
protobuf:
814
- 6.33.5
9-
spdlog:
10-
- '1.17'
11-
pugixml:
12-
- '1.15'
13-
libopencv:
14-
- 4.13.0
15-
libxml2:
16-
- '2.14'
15+
fmt:
16+
- '12.1'
1717
graphviz:
1818
- '14'
19+
jsoncpp:
20+
- 1.9.7
21+
libopencv:
22+
- 4.13.0
1923
# Mitigation for
2024
# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
2125
libcap:
2226
- '2.77'
23-
fmt:
24-
- '12.1'
27+
libhwloc:
28+
- 2.13.0
29+
libxml2:
30+
- '2.14'
31+
libzenohc:
32+
- 1.7.2
33+
libzenohcxx:
34+
- 1.7.2
2535
lua:
2636
- 5.4
37+
pugixml:
38+
- '1.15'
39+
shaderc:
40+
- '2026.2'
41+
spdlog:
42+
- '1.17'
2743
tbb:
2844
- '2022'
2945
tbb_devel:
3046
- '2022'
31-
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
32-
cmake:
33-
- 3.*
34-
# as of early April 2026 key robotics packages like pinocchio still required eigen 3.4.0.*,
35-
# see https://github.com/conda-forge/eigenpy-feedstock/pull/184
36-
eigen_abi_devel:
37-
- '3.4.0'
47+
urdfdom:
48+
- '6.0'
49+
urdfdom_headers:
50+
- '3.0'
51+
vtk:
52+
- 9.6.2
53+
3854
cdt_name: # [linux]
3955
- conda # [linux]
4056
python:
@@ -65,15 +81,3 @@ cxx_compiler_version: # [unix]
6581
- 14 # [linux]
6682
- 18 # [osx]
6783
- 14 # [linux and not ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
68-
libzenohc:
69-
- 1.7.2
70-
libzenohcxx:
71-
- 1.7.2
72-
libhwloc:
73-
- 2.12.2
74-
urdfdom:
75-
- 4.0.1
76-
urdfdom-headers:
77-
- 1.1.2
78-
shaderc:
79-
- 2026.2

patch/ros-kilted-hls-lfcd-lds-driver.patch

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,11 @@ index 9185961..eedc6f7 100644
132132
hls_lfcd_lds::LFCDLaser laser(io);
133133

134134
while (ros::ok())
135+
diff --git a/CMakeLists.txt b/CMakeLists.txt
136+
--- a/CMakeLists.txt
137+
+++ b/CMakeLists.txt
138+
@@ -24,4 +24,4 @@ find_package(ament_cmake REQUIRED)
139+
find_package(rclcpp REQUIRED)
140+
find_package(sensor_msgs REQUIRED)
141+
-find_package(Boost REQUIRED system)
142+
+find_package(Boost REQUIRED)

patch/ros-kilted-moveit-core.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ index 608babbeb..a006b45fc 100644
1111
find_package(octomap_msgs REQUIRED)
1212
find_package(osqp REQUIRED)
1313
find_package(pluginlib REQUIRED)
14+
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
15+
--- a/ConfigExtras.cmake
16+
+++ b/ConfigExtras.cmake
17+
@@ -10,5 +10,4 @@ find_package(
18+
program_options
19+
regex
20+
serialization
21+
- system
22+
thread)
1423
diff --git a/collision_detection/include/moveit/collision_detection/collision_common.hpp b/collision_detection/include/moveit/collision_detection/collision_common.hpp
1524
index 19777a044..af3a89442 100644
1625
--- a/collision_detection/include/moveit/collision_detection/collision_common.hpp

patch/ros-kilted-moveit-kinematics.patch

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,11 @@ index 173471c7e..47e47e2db 100644
2424
// first center is picked randomly
2525
centers.push_back(std::uniform_int_distribution<size_t>{ 0, data.size() - 1 }(rsl::rng()));
2626
for (unsigned i = 1; i < k; ++i)
27+
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
28+
--- a/ConfigExtras.cmake
29+
+++ b/ConfigExtras.cmake
30+
@@ -1,3 +1,3 @@
31+
# Extras module needed for dependencies to find boost components
32+
33+
-find_package(Boost REQUIRED program_options system)
34+
+find_package(Boost REQUIRED program_options)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 91329a1e8..5b4c45bc3 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -8,7 +8,6 @@ moveit_package()
6+
find_package(
7+
Boost
8+
REQUIRED
9+
- system
10+
filesystem
11+
date_time
12+
thread
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
2+
--- a/ConfigExtras.cmake
3+
+++ b/ConfigExtras.cmake
4+
@@ -1,3 +1,3 @@
5+
# Extras module needed for dependencies to find boost components
6+
7+
-find_package(Boost REQUIRED COMPONENTS system thread)
8+
+find_package(Boost REQUIRED COMPONENTS thread)
Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/moveit_ros/move_group/CMakeLists.txt b/moveit_ros/move_group/CMakeLists.txt
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
22
index 7389985043..86bca8785d 100644
3-
--- a/moveit_ros/move_group/CMakeLists.txt
4-
+++ b/moveit_ros/move_group/CMakeLists.txt
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
55
@@ -74,7 +74,7 @@ add_executable(list_move_group_capabilities src/list_capabilities.cpp)
66
ament_target_dependencies(list_move_group_capabilities
77
${THIS_PACKAGE_INCLUDE_DEPENDS})
@@ -11,3 +11,14 @@ index 7389985043..86bca8785d 100644
1111

1212
install(TARGETS move_group list_move_group_capabilities
1313
RUNTIME DESTINATION lib/moveit_ros_move_group)
14+
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
15+
--- a/ConfigExtras.cmake
16+
+++ b/ConfigExtras.cmake
17+
@@ -3,7 +3,6 @@ find_package(
18+
find_package(
19+
Boost
20+
REQUIRED
21+
- system
22+
filesystem
23+
date_time
24+
program_options
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
2+
--- a/ConfigExtras.cmake
3+
+++ b/ConfigExtras.cmake
4+
@@ -8,4 +8,4 @@ find_package(
5+
Boost REQUIRED
6+
COMPONENTS date_time filesystem program_options
7+
# ${BOOST_PYTHON_COMPONENT}
8+
- system thread)
9+
+ thread)

0 commit comments

Comments
 (0)