Skip to content

Commit

Permalink
fix env
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafal-gorecki
rafal-gorecki committed Apr 5, 2024
1 parent 991417d commit 38a69a4
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/industrial_ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ jobs:
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: ${{matrix.ROS_DISTRO}}
HUSARION_ROS_BUILD: simulation
HUSARION_ROS_BUILD_TYPE: simulation
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ For detailed instructions refer to the [rosbot_xl_firmware repository](https://g
```bash
source /opt/ros/$ROS_DISTRO/setup.bash
vcs import src < src/rosbot_xl/rosbot_xl_$HUSARION_ROS_BUILD.repos
vcs import src < src/rosbot_xl/rosbot_xl_$HUSARION_ROS_BUILD_TYPE.repos
# Copy only diff_drive_controller and imu_sensor_broadcaster, waits for features from ros2-control
cp -r src/ros2_controllers/diff_drive_controller src/
Expand Down
4 changes: 2 additions & 2 deletions rosbot_xl/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<depend>rosbot_xl_bringup</depend>
<depend>rosbot_xl_controller</depend>
<depend>rosbot_xl_description</depend>
<depend condition="$HUSARION_ROS_BUILD == simulation">rosbot_xl_gazebo</depend>
<depend condition="$HUSARION_ROS_BUILD == hardware">rosbot_xl_utils</depend>
<depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">rosbot_xl_gazebo</depend>
<depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">rosbot_xl_utils</depend>

<export>
<build_type>ament_cmake</build_type>
Expand Down
4 changes: 2 additions & 2 deletions rosbot_xl_bringup/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@

<exec_depend>laser_filters</exec_depend>
<exec_depend>robot_localization</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">micro_ros_agent</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">micro_ros_agent</exec_depend>

<!-- Microros agent build dependency-->
<build_depend condition="$HUSARION_ROS_BUILD == hardware">git</build_depend>
<build_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">git</build_depend>

<test_depend>rclpy</test_depend>
<test_depend>python3-pytest</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosbot_xl_controller/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<exec_depend>rosbot_xl_description</exec_depend>
<exec_depend>ros_components_description</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">rosbot_hardware_interfaces</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">rosbot_hardware_interfaces</exec_depend>
<exec_depend>mecanum_drive_controller</exec_depend>

<exec_depend>xacro</exec_depend>
Expand Down
46 changes: 23 additions & 23 deletions rosbot_xl_gazebo/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@
<author email="krzysztof.wojciechowski@husarion.com">Krzysztof Wojciechowski</author>
<author email="jakub.delicat@husarion.com">Jakub Delicat</author>

<exec_depend condition="$HUSARION_ROS_BUILD == simulation">ros2launch</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">launch</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">launch_ros</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">ament_index_python</exec_depend>

<exec_depend condition="$HUSARION_ROS_BUILD == simulation">rosbot_xl_bringup</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">husarion_office_gz</exec_depend>

<exec_depend condition="$HUSARION_ROS_BUILD == simulation">ros_gz_sim</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">ros_gz_bridge</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">ign_ros2_control</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">nav2_common</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == simulation">tf2_ros</exec_depend>

<test_depend condition="$HUSARION_ROS_BUILD == simulation">rclpy</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == simulation">python3-pytest</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == simulation">launch_pytest</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == simulation">launch_testing</test_depend>

<test_depend condition="$HUSARION_ROS_BUILD == simulation">python3-psutil</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == simulation">nav_msgs</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == simulation">geometry_msgs</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == simulation">sensor_msgs</test_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">ros2launch</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">launch</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">launch_ros</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">ament_index_python</exec_depend>

<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">rosbot_xl_bringup</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">husarion_office_gz</exec_depend>

<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">ros_gz_sim</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">ros_gz_bridge</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">ign_ros2_control</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">nav2_common</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">tf2_ros</exec_depend>

<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">rclpy</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">python3-pytest</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">launch_pytest</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">launch_testing</test_depend>

<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">python3-psutil</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">nav_msgs</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">geometry_msgs</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == simulation">sensor_msgs</test_depend>

<export>
<build_type>ament_python</build_type>
Expand Down
20 changes: 10 additions & 10 deletions rosbot_xl_utils/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@

<author email="jakub.delicat@husarion.com">Jakub Delicat</author>

<exec_depend condition="$HUSARION_ROS_BUILD == hardware">python3-sh</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">python-periphery-pip</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">python3-pyftdi-pip</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">usbutils</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">python3-serial</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD == hardware">python3-requests</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">python3-sh</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">python-periphery-pip</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">python3-pyftdi-pip</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">usbutils</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">python3-serial</exec_depend>
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">python3-requests</exec_depend>

<test_depend condition="$HUSARION_ROS_BUILD == hardware">ament_copyright</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == hardware">ament_flake8</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == hardware">ament_pep257</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD == hardware">python3-pytest</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">ament_copyright</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">ament_flake8</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">ament_pep257</test_depend>
<test_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">python3-pytest</test_depend>

<export>
<build_type>ament_python</build_type>
Expand Down

0 comments on commit 38a69a4

Please sign in to comment.