Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix installation of dependencies #820

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions industrial_ci/src/tests/source_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,12 @@ function run_source_tests {
ici_step "setup_rosdep" ici_setup_rosdep

extend=${UNDERLAY:?}
export ROSDEP_SOURCE_FOLDERS=("${UNDERLAY:?}") # source folders to be ignored for rosdep install
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should go into env.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable is configured only here (incrementally for all stages).
Moving the initialization into another file seems odd.


if [ -n "$UPSTREAM_WORKSPACE" ]; then
ici_with_ws "$upstream_ws" ici_build_workspace "upstream" "$extend" "$upstream_ws"
extend="$(ici_extend_space "$upstream_ws")"
ROSDEP_SOURCE_FOLDERS+=("$extend")
fi

if [ "${CLANG_TIDY:-false}" != false ]; then
Expand Down Expand Up @@ -206,6 +208,7 @@ function run_source_tests {
fi

extend="$(ici_extend_space "$target_ws")"
ROSDEP_SOURCE_FOLDERS+=("$extend")
if [ -n "$DOWNSTREAM_WORKSPACE" ]; then
ici_with_ws "$downstream_ws" ici_build_workspace "downstream" "$extend" "$downstream_ws"
#extend="$(ici_extend_space "$downstream_ws")"
Expand Down
2 changes: 1 addition & 1 deletion industrial_ci/src/workspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ function ici_build_workspace {
fi

ici_step "setup_${name}_workspace" ici_prepare_sourcespace "$ws/src" "${sources[@]}"
ici_step "install_${name}_dependencies" ici_install_dependencies "$extend" "$ROSDEP_SKIP_KEYS" "$ws/src"
ici_step "install_${name}_dependencies" ici_install_dependencies "$extend" "$ROSDEP_SKIP_KEYS" "$ws/src" "${ROSDEP_SOURCE_FOLDERS[@]}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might even move this into ici_install_dependencies, then it would always use the UNDERLAY by default

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The key is that this variable incrementally changes. Using UNDERLAY always is not intended. I would have made the variable local in run_source_tests but it needs to propagate here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that it will always start from UNDERLAY, just like you intended.

ici_step "build_${name}_workspace" builder_run_build "$extend" "$ws" "${args[@]}"
}

Expand Down