Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/docker/ddsenabler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:24.04
LABEL author=raul@eprosima.com

# Avoid interactuation with installation of some package that needs the locale.
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
libyaml-cpp-dev

# Install required python modules
RUN pip3 install \
RUN pip3 install --break-system-packages \
colcon-common-extensions \
colcon-mixin \
lxml \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ env:
jobs:
docker-test:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

env:
DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE: "ddsenabler:ci"
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Download dependencies and install requirements
uses: ./src/.github/actions/project_dependencies
with:
os: ubuntu-22.04
os: ubuntu-24.04
cmake_build_type: "Release"
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }}
secret_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import log

import os

import validation

DESCRIPTION = """Script to validate listeners output"""
Expand Down Expand Up @@ -78,7 +80,7 @@ def _listener_command(args):
"""
command = [
'python3',
'/opt/ros/jazzy/lib/demo_nodes_py/listener']
f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/listener']

return command

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import log

import os

import validation

DESCRIPTION = """Script to validate talkers output"""
Expand Down Expand Up @@ -67,7 +69,7 @@ def _talker_command(args):
"""
command = [
'python3',
'/opt/ros/jazzy/lib/demo_nodes_py/talker']
f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/talker']

return command

Expand Down