Skip to content

Commit

Permalink
Revert #2025
Browse files Browse the repository at this point in the history
now that ompl issue is resolved
ompl/ompl#753
  • Loading branch information
ruffsl committed Jun 7, 2021
1 parent dce74bf commit 8f4a77c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
12 changes: 0 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,9 @@ _commands:
apt-get update
rosdep update
# workarround for OMPL and rosdep
# https://github.com/ompl/ompl/issues/753
# Prevent searching $ROS_WS/install given it's too big for rosdep
if [ "$ROS_WS" == "<< parameters.underlay >>" ]; then
underlay_ws=""
else
underlay_ws=<< parameters.underlay >>/src
fi
echo underlay_ws = $underlay_ws
dependencies=$(
rosdep install -q -y \
--from-paths src \
$underlay_ws \
--ignore-src \
--skip-keys " \
slam_toolbox \
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ COPY --from=cacher /tmp/$OVERLAY_WS ./
RUN . $UNDERLAY_WS/install/setup.sh && \
apt-get update && rosdep install -q -y \
--from-paths src \
$UNDERLAY_WS/src \
--skip-keys " \
slam_toolbox \
"\
Expand Down
2 changes: 1 addition & 1 deletion tools/underlay.repos
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ repositories:
# ompl/ompl:
# type: git
# url: https://github.com/ompl/ompl.git
# version: 1.5.0
# version: main

0 comments on commit 8f4a77c

Please sign in to comment.