Skip to content

Commit a2438f5

Browse files
authored
Install test-msgs and mrpt-msgs uniformly across all ROS 2 distros (#1518)
Drop the lyrical-specific `ros-lyrical-test-msgs` / `ros-lyrical-mrpt-msgs` lines from the "Install ROS2 from apt (lyrical)" step and instead let the shared "Install test-msgs and mrpt_msgs on Linux" step handle them, the same way it already does for humble / jazzy / kilted. Keep the `!= 'rolling'` gate on the shared step because `packages.ros.org` does not publish `ros-rolling-*` debs for the `resolute` (Ubuntu 26.04) codename — Rolling remains tarball-only there. - `.github/workflows/linux-x64-build-and-test.yml` — extend the shared step to lyrical; trim the lyrical apt step to `ros-lyrical-desktop` only. - `.github/workflows/linux-arm64-build-and-test.yml` — same trim; the shared step has no `if:` here because arm64 has no rolling lane. Refs: a3bb702 ("Add ROS 2 Lyrical Luth (#1496)") Fix: #1458
1 parent 3b9eeaf commit a2438f5

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

.github/workflows/linux-arm64-build-and-test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,9 @@ jobs:
7373
if: ${{ matrix.ros_distribution == 'lyrical' }}
7474
run: |
7575
# Per https://docs.ros.org/en/lyrical/Installation/Ubuntu-Install-Debs.html
76-
apt-get install -y \
77-
ros-lyrical-desktop \
78-
ros-lyrical-test-msgs
76+
apt-get install -y ros-lyrical-desktop
7977
8078
- name: Install test-msgs and mrpt_msgs on Linux
81-
if: ${{ matrix.ros_distribution != 'lyrical' }}
8279
run: |
8380
sudo apt install -y ros-${{ matrix.ros_distribution }}-test-msgs ros-${{ matrix.ros_distribution }}-mrpt-msgs
8481

.github/workflows/linux-x64-build-and-test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ jobs:
8585
if: ${{ matrix.ros_distribution == 'lyrical' }}
8686
run: |
8787
# Per https://docs.ros.org/en/lyrical/Installation/Ubuntu-Install-Debs.html
88-
apt-get install -y \
89-
ros-lyrical-desktop \
90-
ros-lyrical-test-msgs
88+
apt-get install -y ros-lyrical-desktop
9189
9290
- name: Install ROS2 from binary tarball (rolling)
9391
if: ${{ matrix.ros_distribution == 'rolling' }}
@@ -108,7 +106,7 @@ jobs:
108106
rosdep install --rosdistro ${{ matrix.ros_distribution }} --from-paths /opt/ros/${{ matrix.ros_distribution }}/share --ignore-src -y --skip-keys "cyclonedds fastcdr fastdds iceoryx_binding_c rmw_connextdds rti-connext-dds-7.3.0 rti-connext-dds-7.7.0 urdfdom_headers python3-pyqt6.qtsvg rosidl_buffer_py pybind11"
109107
110108
- name: Install test-msgs and mrpt_msgs on Linux
111-
if: ${{ matrix.ros_distribution != 'rolling' && matrix.ros_distribution != 'lyrical' }}
109+
if: ${{ matrix.ros_distribution != 'rolling' }}
112110
run: |
113111
sudo apt install -y ros-${{ matrix.ros_distribution }}-test-msgs ros-${{ matrix.ros_distribution }}-mrpt-msgs
114112

0 commit comments

Comments
 (0)