Skip to content

Commit

Permalink
Ci focal rolling (ros-navigation#2851)
Browse files Browse the repository at this point in the history
* use rolling-ros-base-focal

* hotfix: remove rosdep update from ci
  • Loading branch information
Aposhian authored Mar 18, 2022
1 parent 643bb0f commit 8190716
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ _commands:
sha256sum $PWD/lockfile.txt >> lockfile.txt
apt-get update
rosdep update --rosdistro $ROS_DISTRO
# rosdep update --rosdistro $ROS_DISTRO
dependencies=$(
rosdep install -q -y \
--from-paths src \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# docker build -t nav2:latest \
# --build-arg UNDERLAY_MIXINS \
# --build-arg OVERLAY_MIXINS ./
ARG FROM_IMAGE=ros:rolling
ARG FROM_IMAGE=ros:rolling-ros-base-focal
ARG UNDERLAY_WS=/opt/underlay_ws
ARG OVERLAY_WS=/opt/overlay_ws

Expand Down Expand Up @@ -60,7 +60,7 @@ RUN apt-get update && \
fastcov \
git+https://github.com/ruffsl/colcon-cache.git@a937541bfc496c7a267db7ee9d6cceca61e470ca \
git+https://github.com/ruffsl/colcon-clean.git@a7f1074d1ebc1a54a6508625b117974f2672f2a9 \
&& rosdep update \
# && rosdep update \
&& colcon mixin update \
&& colcon metadata update \
&& rm -rf /var/lib/apt/lists/*
Expand Down
6 changes: 3 additions & 3 deletions tools/distro.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# --build-arg OVERLAY_MIXINS \
# -f distro.Dockerfile ../

ARG FROM_IMAGE=ros:rolling
ARG FROM_IMAGE=ros:rolling-ros-base-focal
ARG OVERLAY_WS=/opt/overlay_ws

# multi-stage for caching
Expand Down Expand Up @@ -56,8 +56,8 @@ RUN --mount=type=cache,target=/var/cache/apt \
apt-get update && apt-get install -q -y \
ccache \
lcov \
lld \
&& rosdep update
lld
# && rosdep update

# install overlay dependencies
ARG OVERLAY_WS
Expand Down
4 changes: 2 additions & 2 deletions tools/source.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ RUN --mount=type=cache,target=/var/cache/apt \
ccache \
libasio-dev \
libtinyxml2-dev \
lld \
&& rosdep update
lld
# && rosdep update

ENV ROS_VERSION=2 \
ROS_PYTHON_VERSION=3
Expand Down

0 comments on commit 8190716

Please sign in to comment.