From d6e7569c96d0eb42b43ca5078aa59a2ff6c3b1d5 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 23:22:23 +0000 Subject: [PATCH] Source underlay workspace on RHEL9 --- .github/workflows/iron-rhel-binary-build.yml | 2 ++ .github/workflows/rolling-rhel-binary-build.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index b674805a9d..ce60f58f3a 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -25,8 +25,10 @@ jobs: rosdep update rosdep install -iyr --from-path src/ros2_controllers || true - name: Build and test + # 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 colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 68a152c45f..38d12ab960 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -25,8 +25,10 @@ jobs: rosdep update rosdep install -iyr --from-path src/ros2_controllers || true - name: Build and test + # 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 colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose