Prevent cross-talk between distros in matrix

Signed-off-by: Ryan Friedman <[email protected]>
BehaviorTree · Jan 20, 2024 · 4de9b00 · 4de9b00
1 parent adf80ba
commit 4de9b00
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/.github/workflows/colcon_ament.yml b/.github/workflows/colcon_ament.yml
@@ -8,18 +8,12 @@ env:
 
 jobs:
   build:
-    container: ${{ matrix.container }}
+    container: osrf/ros:${{matrix.ros_distro}}-desktop
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        container: ['osrf/ros:humble-desktop', 'osrf/ros:rolling-desktop']
         os: [ubuntu-22.04]
         ros_distro: [humble, rolling]
-        include:
-          - container: osrf/ros:humble-desktop
-            ros_distro: humble
-          - container: osrf/ros:rolling-desktop
-            ros_distro: rolling
     steps:
     - uses: actions/checkout@v2
 
@@ -28,36 +22,36 @@ jobs:
       run: |
         apt update
         rosdep update
-        source /opt/ros/${{matrix.rosdistro}}/setup.bash
-        rosdep install --from-paths src --ignore-src -y --rosdistro ${{matrix.rosdistro}}
+        source /opt/ros/${{matrix.ros_distro}}/setup.bash
+        rosdep install --from-paths src --ignore-src -y
       shell: bash
 
     - name: Build with colcon
       id: colcon-build
       run: |
-        source /opt/ros/${{matrix.rosdistro}}/setup.bash
+        source /opt/ros/${{matrix.ros_distro}}/setup.bash
         colcon build
       shell: bash
 
     - name: Test with colcon
       id: colcon-test
       run: |
-        source /opt/ros/${{matrix.rosdistro}}/setup.bash
+        source /opt/ros/${{matrix.ros_distro}}/setup.bash
         colcon test
         colcon test-result --all --verbose
       shell: bash
 
     - name: Test consuming with ament_target_dependencies
       run: |
-        source /opt/ros/${{matrix.rosdistro}}/setup.bash
+        source /opt/ros/${{matrix.ros_distro}}/setup.bash
         # This sets the variable AMENT_PREFIX_PATH
         source install/setup.bash
         cd tests/export/ament_target_deps
         colcon build
 
     - name: Test consuming with target_link_libraries
       run: |
-        source /opt/ros/${{matrix.rosdistro}}/setup.bash
+        source /opt/ros/${{matrix.ros_distro}}/setup.bash
         # This sets the variable AMENT_PREFIX_PATH
         source install/setup.bash
         cd tests/export/target_link_libs