use ros-core images to hopefully align with buildfarm

Author: sgillen

.github/workflows/debian-packages.yml

@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [determine-distros]
     container:
-      image: ros:${{ matrix.ros_distro }}-ros-base-${{ matrix.ubuntu_distro }}
+      image: ros:${{ matrix.ros_distro }}-ros-core-${{ matrix.ubuntu_distro }}
       credentials:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -102,7 +102,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [determine-distros, generate-debian]
     container:
-      image: ros:${{ matrix.ros_distro }}-ros-base-${{ matrix.ubuntu_distro }}
+      image: ros:${{ matrix.ros_distro }}-ros-core-${{ matrix.ubuntu_distro }}
       credentials:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/ros-tests.yml

@@ -30,7 +30,7 @@ jobs:
     name: Test ROS2 ${{ matrix.ros_distro }}
     runs-on: ubuntu-latest
     container:
-      image: ros:${{ matrix.ros_distro }}-ros-base-${{ matrix.ubuntu_distro }}
+      image: ros:${{ matrix.ros_distro }}-ros-core-${{ matrix.ubuntu_distro }}
       credentials:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -54,10 +54,14 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Setup ROS environment
+    - name: Setup tools and rosdep
       run: |
         source /opt/ros/${{ matrix.ros_distro }}/setup.bash
-        apt-get update -qq && apt-get install -y build-essential python3-pip
+        apt-get update -qq
+        apt-get install -y python3-rosdep python3-colcon-common-extensions build-essential cmake git python3-pip
+        rosdep init || true
+        rosdep update
+        rosdep install --from-paths . --rosdistro ${{ matrix.ros_distro }} --ignore-src -r -y
       shell: bash
 
     - name: Install Python dependencies

greenwave_monitor/package.xml

@@ -28,7 +28,6 @@
   <author>Sean Gillen/[email protected], Ann Li/[email protected]></author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
 
   <depend>rclcpp</depend>

scripts/build_debian_packages.sh

@@ -108,6 +108,12 @@ if [ -f "requirements.txt" ]; then
     fi
 fi
 
+# Resolve system dependencies with rosdep (before build)
+echo "Resolving dependencies with rosdep..."
+rosdep init 2>/dev/null || sudo rosdep init 2>/dev/null || true
+rosdep update --include-eol-distros
+rosdep install --from-paths . --rosdistro "$ROS_DISTRO" --ignore-src -r -y
+
 # Build workspace first
 echo "Building workspace..."
 colcon build --packages-up-to r2s_gw