From 52703814db09c12010b6cfc71deb28c69fa4715d Mon Sep 17 00:00:00 2001 From: Thibault Poignonec Date: Wed, 31 Jul 2024 18:04:16 +0200 Subject: [PATCH 1/2] add jazzy CI --- .github/workflows/{ci-iron.yaml => ci-jazzy.yaml} | 6 +++--- .github/workflows/ci-rolling.yaml | 2 +- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{ci-iron.yaml => ci-jazzy.yaml} (82%) diff --git a/.github/workflows/ci-iron.yaml b/.github/workflows/ci-jazzy.yaml similarity index 82% rename from .github/workflows/ci-iron.yaml rename to .github/workflows/ci-jazzy.yaml index a358946..17934a2 100644 --- a/.github/workflows/ci-iron.yaml +++ b/.github/workflows/ci-jazzy.yaml @@ -1,4 +1,4 @@ -name: CI (iron) +name: CI (jazzy) on: push: branches: [ main ] @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ubuntu:jammy + image: ubuntu:noble steps: - uses: actions/checkout@v4 - uses: ros-tooling/setup-ros@v0.7 @@ -18,4 +18,4 @@ jobs: - uses: ros-tooling/action-ros-ci@v0.3 # continue-on-error: true with: - target-ros2-distro: iron + target-ros2-distro: jazzy diff --git a/.github/workflows/ci-rolling.yaml b/.github/workflows/ci-rolling.yaml index 2306981..25346d6 100644 --- a/.github/workflows/ci-rolling.yaml +++ b/.github/workflows/ci-rolling.yaml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ubuntu:jammy + image: ubuntu:noble steps: - uses: actions/checkout@v4 - uses: ros-tooling/setup-ros@v0.7 diff --git a/README.md b/README.md index 5460998..ce97cb3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Wrench estimation and calibration of F/T sensor for ROS2 applications. [![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![CI (humble)](https://github.com/tpoignonec/ft_tools_ros2/actions/workflows/ci.yml/badge.svg)](https://github.com/tpoignonec/ft_tools_ros2/actions/workflows/ci.yml) -[![Build tests (iron)](../../actions/workflows/ci-iron.yaml/badge.svg?branch=main)](../../actions/workflows/ci-iron.yaml?query=branch:main) +[![Build tests (jazzy)](../../actions/workflows/ci-jazzy.yaml/badge.svg?branch=main)](../../actions/workflows/ci-jazzy.yaml?query=branch:main) [![Build tests (rolling)](../../actions/workflows/ci-rolling.yaml/badge.svg?branch=main)](../../actions/workflows/ci-rolling.yaml?query=branch:main) ***The current devs are based on the humble ROS 2 distribution (Ubuntu 22.04 LTS)*** From e87c09a6bec1225a7e50ac96105a6a8c77b24fb5 Mon Sep 17 00:00:00 2001 From: Thibault Poignonec Date: Wed, 31 Jul 2024 18:13:36 +0200 Subject: [PATCH 2/2] fix yaml-cpp --- ft_tools/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ft_tools/CMakeLists.txt b/ft_tools/CMakeLists.txt index b403438..20373a5 100644 --- a/ft_tools/CMakeLists.txt +++ b/ft_tools/CMakeLists.txt @@ -45,6 +45,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC $ ${YAML_CPP_INCLUDEDIR} ) +target_link_libraries(${PROJECT_NAME} yaml-cpp) ament_target_dependencies(${PROJECT_NAME} ${DEPENDENCIES})