Skip to content

Support for CI on top of ros2 nightly images #454

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.

Sign up for GitHub

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

Merged
mathias-luedtke merged 2 commits into from
Dec 21, 2019
Merged

Support for CI on top of ros2 nightly images #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
715284f
Revert "work-around for chained colcon workspaces"
mathias-luedtke Dec 21, 2019
2cf0fe4
add support for foxy / nightly images
mikaelarguedas Dec 21, 2019
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
4 changes: 4 additions & 0 deletions industrial_ci/src/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ function set_ros_variables {
"eloquent")
ros2_defaults "bionic"
;;
"foxy")
ros2_defaults "bionic"
DOCKER_IMAGE=${DOCKER_IMAGE:-osrf/ros2:nightly}
;;
esac

local prefix=ros
Expand Down
5 changes: 1 addition & 4 deletions industrial_ci/src/workspace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,12 @@ function ici_exec_in_workspace {
function ici_install_dependencies {
local extend=$1; shift
local skip_keys=$1; shift
local cmake_prefix_path
cmake_prefix_path="$(ici_exec_in_workspace "$extend" . env | grep -oP '^CMAKE_PREFIX_PATH=\K.*')" || true

rosdep_opts=(-q --from-paths "$@" --ignore-src -y)
if [ -n "$skip_keys" ]; then
rosdep_opts+=(--skip-keys "$skip_keys")
fi
set -o pipefail # fail if rosdep install fails
ROS_PACKAGE_PATH=$cmake_prefix_path ici_exec_in_workspace "$extend" "." rosdep install "${rosdep_opts[@]}" | { grep "executing command" || true; }
ici_exec_in_workspace "$extend" "." rosdep install "${rosdep_opts[@]}" | { grep "executing command" || true; }
set +o pipefail
}

Expand Down