Use matrix strategy also for the other builds

ros-controls · Feb 9, 2024 · 728b1f0 · 728b1f0
1 parent 78c655d
commit 728b1f0
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 123 deletions.
diff --git a/.github/workflows/binary-build.yml → .github/workflows/build-binary.yml b/.github/workflows/binary-build.yml → .github/workflows/build-binary.yml
diff --git a/.github/workflows/build-source_humble.yml → .github/workflows/build-source.yml b/.github/workflows/build-source_humble.yml → .github/workflows/build-source.yml
@@ -1,4 +1,4 @@
-name: Source Build - Humble
+name: Source Build
 on:
   workflow_dispatch:
   push:
@@ -9,9 +9,12 @@ on:
     - cron: '03 3 * * *'
 
 jobs:
-  source:
+  source_build:
     uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling, iron, humble]
     with:
-      ros_distro: humble
+      ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: ros2-master
-      ros2_repo_branch: humble
+      ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
diff --git a/.github/workflows/build-source_iron.yml b/.github/workflows/build-source_iron.yml
diff --git a/.github/workflows/build-source_rollling.yml b/.github/workflows/build-source_rollling.yml
diff --git a/.github/workflows/rolling-debian-build.yml → .github/workflows/debian-build.yml b/.github/workflows/rolling-debian-build.yml → .github/workflows/debian-build.yml
@@ -1,4 +1,4 @@
-name: Debian Rolling Source Build
+name: Debian Source Build
 on:
   workflow_dispatch:
   pull_request:
@@ -10,10 +10,12 @@ on:
 
 
 jobs:
-  rolling_debian:
-    name: Rolling debian build
+  debian_source_build:
     uses: ./.github/workflows/reusable-debian-build.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling, iron, humble]
     with:
-      ros_distro: rolling
-      upstream_workspace: control_toolbox.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: ros2-master
diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml
diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml
diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml
diff --git a/...b/workflows/rolling-rhel-binary-build.yml → .github/workflows/rhel-semi-binary-build.yml b/...b/workflows/rolling-rhel-binary-build.yml → .github/workflows/rhel-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: RHEL Rolling Semi-Binary Build
+name: RHEL Semi-Binary Build
 on:
   workflow_dispatch:
   pull_request:
@@ -10,10 +10,12 @@ on:
 
 
 jobs:
-  rolling_rhel:
-    name: Rolling RHEL semi-binary build
+  rhel_semi_binary_build:
     uses: ./.github/workflows/reusable-rhel-binary-build.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling, iron, humble]
     with:
-      ros_distro: rolling
-      upstream_workspace: control_toolbox.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: ros2-master