Source workspaces before rosdep

ros-controls · Feb 7, 2024 · e7631e9 · e7631e9
1 parent f4debfb
commit e7631e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml
@@ -23,18 +23,20 @@ jobs:
           ref: ${{ github.event_name == 'schedule' && 'humble' || '' }}
       - name: Install dependencies
         run: |
+          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           rosdep update
           rosdep install -iyr --from-path src/ros2_controllers || true
       - name: Build workspace
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           colcon build --packages-up-to $(colcon list --paths src/ros2_controllers/* --names-only) --packages-skip ${{ env.skip-packages }}
       - name: Test workspace
         shell: bash
         continue-on-error: true
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           colcon test --packages-select $(colcon list --paths src/ros2_controllers/* --names-only) --packages-skip ${{ env.skip-packages }}
           colcon test-result --verbose
diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml
@@ -24,19 +24,21 @@ jobs:
           ref: ${{ github.event_name == 'schedule' && 'iron' || '' }}
       - name: Install dependencies
         run: |
+          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           rosdep update
           rosdep install -iyr --from-path src/ros2_controllers || true
       - name: Build workspace
         # source also underlay workspace with generate_parameter_library on rhel9
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           colcon build --packages-up-to $(colcon list --paths src/ros2_controllers/* --names-only) --packages-skip  ${{ env.skip-packages }}
       - name: Test workspace
         shell: bash
         continue-on-error: true
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           colcon test --packages-select $(colcon list --paths src/ros2_controllers/* --names-only) --packages-skip  ${{ env.skip-packages }}
           colcon test-result --verbose
diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml
@@ -25,19 +25,21 @@ jobs:
           # ref: ${{ github.event_name == 'schedule' && 'master' || '' }}
       - name: Install dependencies
         run: |
+          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           rosdep update
           rosdep install -iyr --from-path src/ros2_controllers || true
       - name: Build workspace
         # source also underlay workspace with generate_parameter_library on rhel9
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           colcon build  --packages-up-to $(colcon list --paths src/ros2_controllers/* --names-only) --packages-skip ${{ env.skip-packages }}
       - name: Test workspace
         shell: bash
         continue-on-error: true
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
+          source /opt/ros2_ws/install/local_setup.bash
           colcon test --packages-select $(colcon list --paths src/ros2_controllers/* --names-only) --packages-skip  ${{ env.skip-packages }}
           colcon test-result --verbose