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

[WIP] Remove unneccessary additional ROS 2 dependencies #558

Closed
wants to merge 3 commits into from
Closed
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
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ references:
awk '$1 ~ /^resolution\:/' | \
awk -F'[][]' '{print $2}' | \
tr -d \, | xargs -n1 | sort -u | xargs)
dpkg -s $dependencies | \
if [ -n "$dependencies" ]; then dpkg -s $dependencies | \
sha256sum | \
awk '{print "upstream dependencies "$1}' >> $ROS_WS/checksum.txt
awk '{print "upstream dependencies "$1}' >> $ROS_WS/checksum.txt ; \
fi
restore_upstream_cache: &restore_upstream_cache
restore_cache:
name: Restore Upstream Cache
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ RUN . /opt/ros/$ROS_DISTRO/setup.sh && \

# install navigation2 package dependencies
WORKDIR $NAV2_WS
RUN rm $NAV2_WS/src/navigation2/nav2_system_tests/COLCON_IGNORE
RUN . $ROS_WS/install/setup.sh && \
apt-get update && \
rosdep install -q -y \
Expand All @@ -66,7 +67,6 @@ RUN . $ROS_WS/install/setup.sh && \
&& rm -rf /var/lib/apt/lists/*

# build navigation2 package source
RUN rm $NAV2_WS/src/navigation2/nav2_system_tests/COLCON_IGNORE
RUN . $ROS_WS/install/setup.sh && \
colcon build \
--symlink-install \
Expand Down
13 changes: 1 addition & 12 deletions tools/ros2_dependencies.repos
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
repositories:
BehaviorTree.CPP:
type: git
url: https://github.com/BehaviorTree/BehaviorTree.CPP.git
version: ros2
angles:
type: git
url: https://github.com/ros/angles.git
version: ros2
gazebo_ros_pkgs:
type: git
url: https://github.com/ros-simulation/gazebo_ros_pkgs.git
version: 3.0.0