Also update semi-binary workflows

ros-controls · Feb 15, 2024 · c26b4e9 · c26b4e9
1 parent 823a5b2
commit c26b4e9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
@@ -14,8 +14,13 @@ on:
 
 jobs:
   semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_DISTRO: [humble]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: humble
-      upstream_workspace: ros2_control_demos.humble.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control_demos.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: humble
diff --git a/.github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build.yml
@@ -23,5 +23,5 @@ jobs:
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ros_repo: ${{ matrix.ROS_REPO }}
-      upstream_workspace: ros2_control_demos-not-released.iron.repos
+      upstream_workspace: ros2_control_demos-not-released.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: iron
diff --git a/.github/workflows/iron-semi-binary-build.yml b/.github/workflows/iron-semi-binary-build.yml
@@ -14,8 +14,13 @@ on:
 
 jobs:
   semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_DISTRO: [iron]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: iron
-      upstream_workspace: ros2_control_demos.iron.repos
-      ref_for_scheduled_build: master
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control_demos.${{ matrix.ROS_DISTRO }}.repos
+      ref_for_scheduled_build: iron
diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml
@@ -14,8 +14,13 @@ on:
 
 jobs:
   semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: rolling
-      upstream_workspace: ros2_control_demos.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control_demos.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master