Skip to content

Commit c2473c6

Browse files
committed
fix(workflows, package): Fixes rosidl type support issue with launch tests
Seems like need to do sudo apt-get dist-upgrade, see discussion here: ros2/rosidl#680 [skip ci]
1 parent 644e3d3 commit c2473c6

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
repository: PX4/px4_msgs
3838
path: colcon_ws/src/px4_msgs
3939

40-
- name: Install geographic_msgs and MAVROS
40+
- name: Install geographic_msgs and GeographicLib datasets
4141
run: |
4242
sudo apt-get install wget
4343
sudo apt-get install -y ros-foxy-mavros ros-foxy-mavros-extras
@@ -83,12 +83,15 @@ jobs:
8383
cd ../..
8484
colcon build --packages-select gisnav gisnav_msgs
8585
86-
- name: Run ROS 2 integration tests
86+
- name: Run ROS 2 launch tests
8787
run: |
8888
cd colcon_ws
89+
sudo apt-get -y update
90+
sudo apt-get -y dist-upgrade
8991
source /opt/ros/foxy/setup.bash
9092
source install/setup.bash
91-
launch_test src/gisnav/test/test_px4.py
93+
launch_test src/gisnav/test/launch/test_px4_launch.py
94+
launch_test src/gisnav/test/launch/test_ardupilot_launch.py
9295
9396
- name: Build Sphinx docs
9497
run: |

package.xml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,29 @@
88
<maintainer email="hmakelin@protonmail.com">Harri Makelin</maintainer>
99
<license>MIT</license>
1010

11+
<build_depend>rosidl_default_generators</build_depend>
12+
<exec_depend>rosidl_default_runtime</exec_depend>
13+
<member_of_group>rosidl_interface_packages</member_of_group>
14+
1115
<test_depend>ament_copyright</test_depend>
1216
<test_depend>ament_flake8</test_depend>
1317
<test_depend>ament_pep257</test_depend>
1418
<test_depend>python3-pytest</test_depend>
1519
<test_depend>launch_testing</test_depend>
1620

17-
<exec_depend>rclpy</exec_depend>
18-
<exec_depend>rcl_interfaces</exec_depend>
19-
<exec_depend>cv_bridge</exec_depend>
20-
<exec_depend>sensor_msgs</exec_depend>
21-
<exec_depend>geometry_msgs</exec_depend>
22-
<exec_depend>mavros_msgs</exec_depend>
23-
<exec_depend>geographic_msgs</exec_depend>
24-
<exec_depend>std_msgs</exec_depend>
25-
<exec_depend>px4_msgs</exec_depend>
26-
<exec_depend>gisnav_msgs</exec_depend>
27-
<exec_depend>ros2launch</exec_depend>
21+
<depend>rclpy</depend>
22+
<depend>rosidl_typesupport_c</depend>
23+
<depend>rcl_interfaces</depend>
24+
<depend>cv_bridge</depend>
25+
<depend>std_msgs</depend>
26+
<depend>sensor_msgs</depend>
27+
<depend>geometry_msgs</depend>
28+
<depend>mavros_msgs</depend>
29+
<depend>geographic_info</depend>
30+
<depend>geographic_msgs</depend>
31+
<depend>px4_msgs</depend>
32+
<depend>gisnav_msgs</depend>
33+
<depend>ros2launch</depend>
2834

2935
<export>
3036
<build_type>ament_python</build_type>

0 commit comments

Comments
 (0)