From c27cd0f048cbbd60923610cc40786250ee0525a2 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 24 Apr 2024 19:04:58 +0000
Subject: [PATCH] Use matrix strategy

---
 .github/workflows/build-source.yml  | 14 ++++++++++++--
 .github/workflows/ci-pre-commit.yml | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml
index 203f8db..50b33e0 100644
--- a/.github/workflows/build-source.yml
+++ b/.github/workflows/build-source.yml
@@ -14,9 +14,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        include:
+        - ROS_DISTRO: humble
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: iron
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: rolling
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: ros2-master
       ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
-      container: ubuntu:24.04
+      os_name: ${{ matrix.OS_NAME }}
+      container: ${{ matrix.CONTAINER }}
diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml
index 05b1e12..ae9e858 100644
--- a/.github/workflows/ci-pre-commit.yml
+++ b/.github/workflows/ci-pre-commit.yml
@@ -10,13 +10,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [iron, humble]
+        include:
+        - ROS_DISTRO: humble
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: iron
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: rolling
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
-      os_name: ubuntu-22.04
-
-  pre-commit-rolling:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
-    with:
-      ros_distro: rolling
-      container: ubuntu:24.04
+      os_name: ${{ matrix.OS_NAME }}
+      container: ${{ matrix.CONTAINER }}