use correct matrix strategy

ros-controls · Apr 24, 2024 · ff233bc · ff233bc
1 parent 89e0668
commit ff233bc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml
@@ -7,14 +7,19 @@ on:
       - master
 
 jobs:
-  pre-commit-iron:
+  pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - ROS_DISTRO: iron
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: rolling
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
     with:
-      ros_distro: iron
-      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
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      os_name: ${{ matrix.OS_NAME }}
+      container: ${{ matrix.CONTAINER }}
diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml
@@ -14,9 +14,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        include:
+        - 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: master
+      ref: ros2-master
       ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
-      container: ubuntu:24.04
+      os_name: ${{ matrix.OS_NAME }}
+      container: ${{ matrix.CONTAINER }}