Skip to content

Commit

Permalink
Remove upstreamed patch to octomap_msgs (#203)
Browse files Browse the repository at this point in the history
Fixed upstream by [16af48e](OctoMap/octomap_msgs@16af48e)
Released in [`octomap_msgs` version `2.0.1`](https://github.com/OctoMap/octomap_msgs/releases/tag/2.0.1)
  • Loading branch information
Bckempa committed Nov 17, 2024
1 parent 045f144 commit 9042e7f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
4 changes: 0 additions & 4 deletions moveit2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
/bin/bash -c 'source ${SPACEROS_DIR}/install/setup.bash' \
&& rosdep install --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -r -y --skip-keys "console_bridge generate_parameter_library fastcdr fastrtps rti-connext-dds-5.3.1 urdfdom_headers rmw_connextdds ros_testing rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp composition demo_nodes_py lifecycle rosidl_typesupport_fastrtps_cpp rosidl_typesupport_fastrtps_c ikos diagnostic_aggregator diagnostic_updater joy qt_gui rqt_gui rqt_gui_py"

# Apply a patch to octomap_msgs to work around a build issue
COPY --chown=${USERNAME}:${USERNAME} octomap_fix.diff ./src/octomap_msgs
RUN cd src/octomap_msgs && git apply octomap_fix.diff

# Build MoveIt2
RUN /bin/bash -c 'source ${SPACEROS_DIR}/install/setup.bash \
&& colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON --event-handlers desktop_notification- status-'
Expand Down
13 changes: 0 additions & 13 deletions moveit2/octomap_fix.diff

This file was deleted.

0 comments on commit 9042e7f

Please sign in to comment.