Merge branch 'v8.7' into satellite_sim_improve3

Author: dyackzan

.gitattributes

@@ -11,7 +11,7 @@
 *.3ds filter=lfs diff=lfs merge=lfs -text
 *.blend filter=lfs diff=lfs merge=lfs -text
 # Add Git LFS support for large yaml files
-src/moveit_pro_franka_configs/franka_mujoco_config/objectives/moveitpro_loves_franka.yaml filter=lfs diff=lfs merge=lfs -text
+src/moveit_pro_franka_configs/franka_arm_sim/objectives/moveitpro_loves_franka.yaml filter=lfs diff=lfs merge=lfs -text
 src/moveit_pro_franka_configs/franka_dual_arm_sim/objectives/loves.yaml filter=lfs diff=lfs merge=lfs -text
 src/moveit_pro_franka_configs/franka_dual_arm_sim/objectives/moveit_pro.yaml filter=lfs diff=lfs merge=lfs -text
 src/moveit_pro_franka_configs/franka_dual_arm_sim/objectives/wipe.yaml filter=lfs diff=lfs merge=lfs -text

Dockerfile

@@ -31,7 +31,7 @@ ENV USER_WS=${USER_WS}
 # Ensure the directory exists
 RUN mkdir -p /etc/security
 # Copy the custom limits configuration into the container
-COPY src/moveit_pro_franka_configs/franka_hw_config/config/rt_limits.conf /etc/security/limits.conf
+COPY src/moveit_pro_franka_configs/franka_arm_hw/config/rt_limits.conf /etc/security/limits.conf
 
 # Also mkdir with user permission directories which will be mounted later to avoid docker creating them as root
 WORKDIR $USER_WS

colcon-defaults.yaml

@@ -16,7 +16,33 @@ build:
     - build-testing-on
     - coverage-gcc
     - coverage-pytest
+  packages-skip:
+    - libfranka
+    - franka_bringup
+    - franka_example_controllers
+    - franka_fr3_moveit_config
+    - franka_gazebo_bringup
+    - franka_ign_ros2_control
+    - franka_gripper
+    - franka_hardware
+    - franka_robot_state_broadcaster
+    - franka_ros2
+    - franka_semantic_components
+    - integration_launch_testing
 test:
   event-handlers:
     - console_direct+
     - desktop_notification+
+  packages-skip:
+    - libfranka
+    - franka_bringup
+    - franka_example_controllers
+    - franka_fr3_moveit_config
+    - franka_gazebo_bringup
+    - franka_ign_ros2_control
+    - franka_gripper
+    - franka_hardware
+    - franka_robot_state_broadcaster
+    - franka_ros2
+    - franka_semantic_components
+    - integration_launch_testing