Skip to content

Commit

Permalink
Move to ws folder for rosdep command, fixes ros-industrial#876
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dave992 committed Aug 20, 2024
1 parent 7d16042 commit cff01d8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion industrial_ci/src/workspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit cff01d8

Please sign in to comment.