@@ -222,7 +222,8 @@ jobs:
222222 catkin_make_isolated ${{ matrix.CATKIN_OPTIONS }} --cmake-args -DCATKIN_ENABLE_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ${{ matrix.CMAKE_OPTIONS }}
223223 shell : bash
224224
225- # ROS-O setup https://github.com/v4hn/ros-o-builder/blob/jammy-one/README.md#install-instructions
225+ # ROS-O setup for v4hn https://github.com/v4hn/ros-o-builder/blob/jammy-one/README.md#install-instructions
226+ # ROS-O setup for techfak https://ros.packages.techfak.net/
226227 ros-o :
227228 runs-on : ubuntu-latest
228229
@@ -231,7 +232,11 @@ jobs:
231232 matrix :
232233 include :
233234 - DISTRO : ubuntu:22.04
234- ROS_REPOSITORY_URL : https://raw.githubusercontent.com/v4hn/ros-o-builder/jammy-one/repository
235+ ROS_REPOSITORY_URL : " deb [trusted=yes] https://raw.githubusercontent.com/v4hn/ros-o-builder/jammy-one/repository ./"
236+ ROSDEP_PACKAGE_MAPPING : " yaml https://raw.githubusercontent.com/v4hn/ros-o-builder/jammy-one/repository/local.yaml debian"
237+ - DISTRO : ubuntu:24.04
238+ ROS_REPOSITORY_URL : " deb [trusted=yes] https://ros.packages.techfak.net noble main"
239+ ROSDEP_PACKAGE_MAPPING : " yaml https://ros.packages.techfak.net/ros-one.yaml ubuntu"
235240
236241 container : ${{ matrix.DISTRO }}
237242
@@ -246,24 +251,22 @@ jobs:
246251 run : |
247252 set -x
248253 apt update && apt install -qq -y ca-certificates
249- echo "deb [trusted=yes] ${{ matrix.ROS_REPOSITORY_URL }}/ ./" | tee /etc/apt/sources.list.d/ros-o-builder.list
254+ echo ${{ matrix.ROS_REPOSITORY_URL }} | tee /etc/apt/sources.list.d/ros-o-builder.list
250255 ##
251256 # https://github.com/v4hn/ros-deb-builder-action/blob/b7c0ed93fde3a86b5b1027bf8f7145cad6067c90/prepare.sh#L27-L28
252257 # Canonical dropped the Debian ROS packages from 24.04 for political reasons. Wow.
253258 test "${{ matrix.DISTRO }}" = "ubuntu:24.04" && apt install -y software-properties-common retry && retry -d 50,10,30,300 -t 12 add-apt-repository -y ppa:v-launchpad-jochen-sprickerhof-de/ros
254259 ##
255260 apt update
256261 apt install -qq -y python3-rosdep2
257- echo "yaml ${{ matrix.ROS_REPOSITORY_URL }}/local.yaml debian" | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list
262+ echo ${{ matrix.ROSDEP_PACKAGE_MAPPING }} | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list
258263 rosdep update
259264
260265 - name : Setup catkin-tools
261266 run : |
262267 set -x
263268 # setup catkin tools
264- apt install -qq -y python3-pip
265- pip3 install catkin-tools
266- # setup build tools
269+ apt install -qq -y python3-pip python3-catkin-tools
267270 apt install -qq -y cmake build-essential catkin ros-one-rosbash
268271
269272 - name : Setup Workspace
0 commit comments