From e16cacb7ba5762d317c4d9ec17c1e0d1eb5d0346 Mon Sep 17 00:00:00 2001 From: Dave Kroezen Date: Tue, 20 Aug 2024 11:38:34 +0200 Subject: [PATCH] Move to ws folder for rosdep command, fixes #876 Executing the rosdep command from the root of repository (!= workspace), results in multiple packages found with the same name when run from the CI on GitLab. Unable to reproduce this from inside the same container as the CI runs, but this fix seems to circumvent the issue by restricting the folders rosdep can search in. Functionally this should behave the same. --- industrial_ci/src/workspace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh index 6e60d23e2..5532ca39a 100644 --- a/industrial_ci/src/workspace.sh +++ b/industrial_ci/src/workspace.sh @@ -373,7 +373,7 @@ function ici_install_dependencies { rosdep_opts+=(--skip-keys "$skip_keys") fi - ROS_PACKAGE_PATH="$cmake_prefix_path${ROS_PACKAGE_PATH:-}" ici_cmd ici_quiet ici_filter "(executing command)|(Setting up)" ici_exec_in_workspace "$extend" "." rosdep install "${rosdep_opts[@]}" + ROS_PACKAGE_PATH="$cmake_prefix_path${ROS_PACKAGE_PATH:-}" ici_cmd ici_quiet ici_filter "(executing command)|(Setting up)" ici_exec_in_workspace "$extend" "$@" rosdep install "${rosdep_opts[@]}" } function ici_build_workspace {