Use strategy matrix for main/testing

ros-controls · Feb 9, 2024 · bdb62d4 · bdb62d4
1 parent a4d7999
commit bdb62d4
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 165 deletions.
diff --git a/...workflows/humble-binary-build-testing.yml → .github/workflows/humble-binary-build.yml b/...workflows/humble-binary-build-testing.yml → .github/workflows/humble-binary-build.yml
@@ -1,4 +1,4 @@
-name: Humble Binary Build - testing
+name: Humble Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -17,8 +17,12 @@ on:
 jobs:
   binary:
     uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [humble]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: humble
-      ros_repo: testing
-      upstream_workspace: ros2_control-not-released.humble.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control-not-released.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: humble
diff --git a/.github/workflows/humble-semi-binary-build-main.yml b/.github/workflows/humble-semi-binary-build-main.yml
diff --git a/.github/workflows/humble-semi-binary-build-testing.yml b/.github/workflows/humble-semi-binary-build-testing.yml
diff --git a/...ub/workflows/humble-binary-build-main.yml → ...ub/workflows/humble-semi-binary-build.yml b/...ub/workflows/humble-binary-build-main.yml → ...ub/workflows/humble-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: Humble Binary Build - main
+name: Humble Semi-Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -17,8 +17,12 @@ on:
 jobs:
   binary:
     uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [humble]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: humble
-      ros_repo: main
-      upstream_workspace: ros2_control-not-released.humble.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: humble
diff --git a/.github/workflows/iron-binary-build-main.yml → .github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build-main.yml → .github/workflows/iron-binary-build.yml
@@ -1,4 +1,4 @@
-name: Iron Binary Build - main
+name: Iron Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -17,8 +17,12 @@ on:
 jobs:
   binary:
     uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [iron]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: iron
-      ros_repo: main
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_control-not-released.iron.repos
       ref_for_scheduled_build: iron
diff --git a/.github/workflows/iron-semi-binary-build-main.yml b/.github/workflows/iron-semi-binary-build-main.yml
diff --git a/.github/workflows/iron-semi-binary-build-testing.yml b/.github/workflows/iron-semi-binary-build-testing.yml
diff --git a/...b/workflows/iron-binary-build-testing.yml → .github/workflows/iron-semi-binary-build.yml b/...b/workflows/iron-binary-build-testing.yml → .github/workflows/iron-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: Iron Binary Build - testing
+name: Iron Semi-Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -17,8 +17,12 @@ on:
 jobs:
   binary:
     uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [iron]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: iron
-      ros_repo: testing
-      upstream_workspace: ros2_control-not-released.iron.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control.iron.repos
       ref_for_scheduled_build: iron
diff --git a/...orkflows/rolling-binary-build-testing.yml → .github/workflows/rolling-binary-build.yml b/...orkflows/rolling-binary-build-testing.yml → .github/workflows/rolling-binary-build.yml
@@ -1,11 +1,9 @@
-name: Rolling Binary Build - testing
+name: Rolling Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
 on:
   workflow_dispatch:
-    branches:
-      - master
   pull_request:
     branches:
       - master
@@ -19,8 +17,12 @@ on:
 jobs:
   binary:
     uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: rolling
-      ros_repo: testing
-      upstream_workspace: ros2_control-not-released.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control-not-released.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-semi-binary-build-main.yml b/.github/workflows/rolling-semi-binary-build-main.yml
diff --git a/.github/workflows/rolling-semi-binary-build-testing.yml b/.github/workflows/rolling-semi-binary-build-testing.yml
diff --git a/...b/workflows/rolling-binary-build-main.yml → ...b/workflows/rolling-semi-binary-build.yml b/...b/workflows/rolling-binary-build-main.yml → ...b/workflows/rolling-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: Rolling Binary Build - main
+name: Rolling Semi-Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -17,8 +17,12 @@ on:
 jobs:
   binary:
     uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling]
+        ROS_REPO: [main, testing]
     with:
-      ros_distro: rolling
-      ros_repo: main
-      upstream_workspace: ros2_control-not-released.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master