From 8358e62ad6ebdd6370fa7a35bbc89923f301d96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 20 May 2025 11:13:29 +0200 Subject: [PATCH 1/3] Bump CI versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- .github/workflows/ci.yml | 10 +++++++--- .github/workflows/nightly.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e2ac3c..b462d39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,10 @@ on: pull_request: branches: - '**' + workflow_dispatch: + inputs: + name: + description: "Manual trigger" jobs: build: @@ -12,16 +16,16 @@ jobs: fail-fast: false matrix: include: - - docker_image: ubuntu:jammy + - docker_image: ubuntu:24.04 ros_distribution: rolling container: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - - uses : ros-tooling/action-ros-ci@0.3.2 + - uses : ros-tooling/action-ros-ci@0.3.13 with: package-name: "micro_ros_utilities" target-ros2-distro: ${{ matrix.ros_distribution }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 44178d5..a066304 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: include: - - docker_image: ubuntu:jammy + - docker_image: ubuntu:24.04 ros_distribution: rolling - docker_image: ubuntu:jammy ros_distribution: iron From 50a8bcfc377efcc45ff5a49f3a2d0fd52c1ee0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 20 May 2025 11:33:30 +0200 Subject: [PATCH 2/3] Use target_link_libraries instead of ament_target_dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd8250b..871dd00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,10 +36,10 @@ target_include_directories(${PROJECT_NAME} $ ) -ament_target_dependencies(${PROJECT_NAME} - rosidl_typesupport_introspection_c - rosidl_runtime_c - rcutils +target_link_libraries(${PROJECT_NAME} + rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c + rosidl_runtime_c::rosidl_runtime_c + rcutils::rcutils ) ################################################# @@ -75,13 +75,13 @@ if(BUILD_TESTING) target_include_directories(${PROJECT_NAME}_test PRIVATE include src) target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME}) - ament_target_dependencies(${PROJECT_NAME}_test - rosidl_typesupport_introspection_c - rosidl_generator_c - rosidl_runtime_c - rcutils - std_msgs - trajectory_msgs + target_link_libraries(${PROJECT_NAME}_test + rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c + rosidl_generator_c::rosidl_generator_c + rosidl_runtime_c::rosidl_runtime_c + rcutils::rcutils + std_msgs::std_msgs + trajectory_msgs::trajectory_msgs ) endif() From e3d0f33db34383ded3f5d4c57b14f06488ccb051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Wed, 21 May 2025 09:34:46 +0200 Subject: [PATCH 3/3] Fix library names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 871dd00..4547460 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,11 +77,11 @@ if(BUILD_TESTING) target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME}_test rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c - rosidl_generator_c::rosidl_generator_c + ${rosidl_generator_c_LIBRARIES} rosidl_runtime_c::rosidl_runtime_c rcutils::rcutils - std_msgs::std_msgs - trajectory_msgs::trajectory_msgs + ${std_msgs_TARGETS} + ${trajectory_msgs_TARGETS} ) endif()