Fix building instructions

husarion · Dec 10, 2024 · 1cb0bdb · 1cb0bdb
1 parent a3b6a17
commit 1cb0bdb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -31,13 +31,17 @@ 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
       - name: Leave only ROSbot tests
         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
@@ -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
@@ -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
@@ -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 && \