From ef7328454126ddbbbdbe34d98950f8d16c244c94 Mon Sep 17 00:00:00 2001
From: Minggang Wang <minggangw@gmail.com>
Date: Mon, 25 May 2026 13:15:11 +0800
Subject: [PATCH 1/2] Install test-msgs and mrpt-msgs uniformly across all ROS
 2 distros

---
 .github/workflows/linux-arm64-build-and-test.yml | 5 +----
 .github/workflows/linux-x64-build-and-test.yml   | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linux-arm64-build-and-test.yml b/.github/workflows/linux-arm64-build-and-test.yml
index 02a566cb..ea5304b1 100644
--- a/.github/workflows/linux-arm64-build-and-test.yml
+++ b/.github/workflows/linux-arm64-build-and-test.yml
@@ -73,12 +73,9 @@ jobs:
       if: ${{ matrix.ros_distribution == 'lyrical' }}
       run: |
         # Per https://docs.ros.org/en/lyrical/Installation/Ubuntu-Install-Debs.html
-        apt-get install -y \
-          ros-lyrical-desktop \
-          ros-lyrical-test-msgs
+        apt-get install -y ros-lyrical-desktop
 
     - name: Install test-msgs and mrpt_msgs on Linux
-      if: ${{ matrix.ros_distribution != 'lyrical' }}
       run: |
         sudo apt install -y ros-${{ matrix.ros_distribution }}-test-msgs ros-${{ matrix.ros_distribution }}-mrpt-msgs
 
diff --git a/.github/workflows/linux-x64-build-and-test.yml b/.github/workflows/linux-x64-build-and-test.yml
index ee91b0ac..6ec1e8ad 100644
--- a/.github/workflows/linux-x64-build-and-test.yml
+++ b/.github/workflows/linux-x64-build-and-test.yml
@@ -85,9 +85,7 @@ jobs:
       if: ${{ matrix.ros_distribution == 'lyrical' }}
       run: |
         # Per https://docs.ros.org/en/lyrical/Installation/Ubuntu-Install-Debs.html
-        apt-get install -y \
-          ros-lyrical-desktop \
-          ros-lyrical-test-msgs
+        apt-get install -y ros-lyrical-desktop
 
     - name: Install ROS2 from binary tarball (rolling)
       if: ${{ matrix.ros_distribution == 'rolling' }}
@@ -108,7 +106,6 @@ jobs:
         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"
 
     - name: Install test-msgs and mrpt_msgs on Linux
-      if: ${{ matrix.ros_distribution != 'rolling' && matrix.ros_distribution != 'lyrical' }}
       run: |
         sudo apt install -y ros-${{ matrix.ros_distribution }}-test-msgs ros-${{ matrix.ros_distribution }}-mrpt-msgs
 

From 2d1eb7de1876ee939e3eee4c63fbea823355a990 Mon Sep 17 00:00:00 2001
From: Minggang Wang <minggangw@gmail.com>
Date: Mon, 25 May 2026 13:29:10 +0800
Subject: [PATCH 2/2] Address comments

---
 .github/workflows/linux-x64-build-and-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linux-x64-build-and-test.yml b/.github/workflows/linux-x64-build-and-test.yml
index 6ec1e8ad..a389fd72 100644
--- a/.github/workflows/linux-x64-build-and-test.yml
+++ b/.github/workflows/linux-x64-build-and-test.yml
@@ -106,6 +106,7 @@ jobs:
         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"
 
     - name: Install test-msgs and mrpt_msgs on Linux
+      if: ${{ matrix.ros_distribution != 'rolling' }}
       run: |
         sudo apt install -y ros-${{ matrix.ros_distribution }}-test-msgs ros-${{ matrix.ros_distribution }}-mrpt-msgs