From 1cb0bdb3637f70601f65f8097bc03cf6e494d40a Mon Sep 17 00:00:00 2001 From: rafal-gorecki Date: Tue, 10 Dec 2024 12:20:13 +0000 Subject: [PATCH] Fix building instructions --- .github/workflows/tests.yaml | 4 ++++ README.md | 7 ++++++- docker/Dockerfile.hardware | 3 +++ docker/Dockerfile.simulation | 5 +++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 2dc33e13..6f3b4829 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -31,6 +31,9 @@ jobs: python3 -m pip install -U vcstool vcs import src < src/rosbot_ros/rosbot/rosbot_hardware.repos vcs import src < src/rosbot_ros/rosbot/rosbot_simulation.repos + cp -r src/ros2_controllers/diff_drive_controller src/ + cp -r src/ros2_controllers/imu_sensor_broadcaster src/ + rm -rf src/ros2_controllers # Package micro_ros_msgs does not have industrial ci and tests does not pass. # For more information see https://github.com/micro-ROS/micro_ros_msgs/issues/7 @@ -38,6 +41,7 @@ jobs: shell: bash run: | sed '/if(BUILD_TESTING)/,/endif()/d' src/micro_ros_msgs/CMakeLists.txt -i + sed '/if(BUILD_TESTING)/,/endif()/d' src/ros_components_description/CMakeLists.txt -i - name: Running ROS Industrial CI uses: ros-industrial/industrial_ci@master diff --git a/README.md b/README.md index f5173e0e..4c8a4bad 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,9 @@ export HUSARION_ROS_BUILD_TYPE=hardware source /opt/ros/$ROS_DISTRO/setup.bash vcs import src < src/rosbot_ros/rosbot/rosbot_hardware.repos - +cp -r src/ros2_controllers/diff_drive_controller src/ +cp -r src/ros2_controllers/imu_sensor_broadcaster src/ +rm -rf src/ros2_controllers rm -r src/rosbot_ros/rosbot_gazebo sudo rosdep init @@ -77,6 +79,9 @@ export HUSARION_ROS_BUILD_TYPE=simulation source /opt/ros/$ROS_DISTRO/setup.bash vcs import src < src/rosbot_ros/rosbot/rosbot_simulation.repos +cp -r src/ros2_controllers/diff_drive_controller src/ +cp -r src/ros2_controllers/imu_sensor_broadcaster src/ +rm -rf src/ros2_controllers sudo rosdep init rosdep update --rosdistro $ROS_DISTRO diff --git a/docker/Dockerfile.hardware b/docker/Dockerfile.hardware index 374032e6..40fdc875 100644 --- a/docker/Dockerfile.hardware +++ b/docker/Dockerfile.hardware @@ -16,6 +16,9 @@ RUN apt-get update && apt-get install -y \ ros-${ROS_DISTRO}-teleop-twist-keyboard && \ # Setup workspace vcs import src < src/rosbot_ros/rosbot/rosbot_hardware.repos && \ + cp -r src/ros2_controllers/diff_drive_controller src/ && \ + cp -r src/ros2_controllers/imu_sensor_broadcaster src/ && \ + rm -rf src/ros2_controllers && \ rm -r src/rosbot_ros/rosbot_gazebo && \ # Install dependencies rosdep init && \ diff --git a/docker/Dockerfile.simulation b/docker/Dockerfile.simulation index d3784579..6f623ec6 100644 --- a/docker/Dockerfile.simulation +++ b/docker/Dockerfile.simulation @@ -17,8 +17,9 @@ RUN apt-get update && apt-get install -y \ # Setup workspace vcs import src < src/rosbot_ros/rosbot/rosbot_hardware.repos && \ vcs import src < src/rosbot_ros/rosbot/rosbot_simulation.repos && \ - # cp -r src/ros2_controllers/imu_sensor_broadcaster src && \ - # rm -rf src/ros2_controllers && \ + cp -r src/ros2_controllers/diff_drive_controller src/ && \ + cp -r src/ros2_controllers/imu_sensor_broadcaster src/ && \ + rm -rf src/ros2_controllers && \ # Install dependencies rosdep init && \ rosdep update --rosdistro $ROS_DISTRO && \