Use matrix strategy

ros-controls · Apr 24, 2024 · c27cd0f · c27cd0f
1 parent a3a5ac6
commit c27cd0f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git 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
@@ -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 }}