do vcs in dockerfile instead

PickNikRobotics · Sep 24, 2024 · 2b01c90 · 2b01c90
1 parent 0773207
commit 2b01c90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -24,9 +24,6 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: VCS import
-        run: vcs import src --input src/fuse/fuse.repos; rosdep install --ignore-src --from-paths src -y -r
-
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
 

diff --git a/Dockerfile b/Dockerfile
@@ -9,6 +9,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     apt-get update && apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
       clang-tidy \
+      python3-vcstool \
       # use cyclonedds instead of fastdds
       ros-rolling-rmw-cyclonedds-cpp
 
@@ -22,6 +23,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get upgrade -y && \
     . /opt/ros/rolling/setup.sh && \
+    vcs import src --input src/fuse/fuse.repos && \
     rosdep install --from-paths src -y --ignore-src && \
     colcon build --mixin compile-commands coverage-gcc coverage-pytest