From 6fb5634f450926b847e5e3af4d730be72545471d Mon Sep 17 00:00:00 2001 From: Francisco Miguel Moreno Date: Mon, 6 Jul 2026 11:57:17 +0200 Subject: [PATCH 1/2] Fix rolling CI --- .github/workflows/rolling.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rolling.yaml b/.github/workflows/rolling.yaml index d70f2b6..cafefba 100644 --- a/.github/workflows/rolling.yaml +++ b/.github/workflows/rolling.yaml @@ -12,18 +12,16 @@ on: workflow_dispatch: jobs: build-and-test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 container: - image: ubuntu:noble + image: ghcr.io/ros-tooling/setup-ros-docker/setup-ros-docker-ubuntu-resolute-ros-rolling-ros-base:master steps: - name: Repo checkout - uses: actions/checkout@v6-beta + uses: actions/checkout@v6 with: ref: rolling - - name: Setup ROS 2 - uses: ros-tooling/setup-ros@0.7.15 - name: build and test - uses: ros-tooling/action-ros-ci@0.4.5 + uses: ros-tooling/action-ros-ci@0.4.8 with: package-name: easynav_common easynav_controller easynav_core easynav_interfaces easynav_localizer easynav_maps_manager easynav_planner easynav_sensors easynav_support_py easynav_system easynav_tools easynav_bonxai_maps_manager easynav_costmap_common easynav_costmap_localizer easynav_costmap_maps_manager easynav_costmap_planner easynav_gps_localizer easynav_fusion_localizer easynav_mppi_controller easynav_navmap_localizer easynav_navmap_maps_manager easynav_navmap_planner easynav_serest_controller easynav_simple_common easynav_simple_controller easynav_simple_localizer easynav_simple_maps_manager easynav_simple_planner easynav_vff_controller easynav_mpc_controller target-ros2-distro: rolling From b63922baa5455a5aad11345576b0d6693e8014b2 Mon Sep 17 00:00:00 2001 From: Francisco Miguel Moreno Date: Mon, 6 Jul 2026 12:23:19 +0200 Subject: [PATCH 2/2] Update calls to deprecated get_package_share_directory --- .../src/easynav_bonxai_maps_manager/BonxaiMapsManager.cpp | 6 +++--- .../src/easynav_costmap_maps_manager/CostmapMapsManager.cpp | 4 ++-- .../src/easynav_navmap_maps_manager/NavMapMapsManager.cpp | 6 +++--- .../src/easynav_octomap_maps_manager/OctomapMapsManager.cpp | 6 +++--- .../src/easynav_routes_maps_manager/RoutesMapsManager.cpp | 6 +++--- .../src/easynav_simple_maps_manager/SimpleMapsManager.cpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/maps_managers/easynav_bonxai_maps_manager/src/easynav_bonxai_maps_manager/BonxaiMapsManager.cpp b/maps_managers/easynav_bonxai_maps_manager/src/easynav_bonxai_maps_manager/BonxaiMapsManager.cpp index b522247..4ad4cfb 100644 --- a/maps_managers/easynav_bonxai_maps_manager/src/easynav_bonxai_maps_manager/BonxaiMapsManager.cpp +++ b/maps_managers/easynav_bonxai_maps_manager/src/easynav_bonxai_maps_manager/BonxaiMapsManager.cpp @@ -27,7 +27,7 @@ #include "pcl/point_types.h" #include "pcl/point_cloud.h" -#include "ament_index_cpp/get_package_share_directory.hpp" +#include "ament_index_cpp/get_package_share_path.hpp" #include "ament_index_cpp/get_package_prefix.hpp" namespace easynav_bonxai @@ -73,7 +73,7 @@ BonxaiMapsManager::on_initialize() if (!package_name.empty() && !bonxai_path_file.empty()) { try { - const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); + const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); map_path_ = pkgpath + std::string("/") + bonxai_path_file; } catch (ament_index_cpp::PackageNotFoundError & ex) { throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); @@ -106,7 +106,7 @@ BonxaiMapsManager::on_initialize() if (!package_name.empty() && !occmap_path_file.empty()) { try { - const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); + const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); map_path_ = pkgpath + std::string("/") + occmap_path_file; } catch (ament_index_cpp::PackageNotFoundError & ex) { throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); diff --git a/maps_managers/easynav_costmap_maps_manager/src/easynav_costmap_maps_manager/CostmapMapsManager.cpp b/maps_managers/easynav_costmap_maps_manager/src/easynav_costmap_maps_manager/CostmapMapsManager.cpp index 66be212..3f8507e 100644 --- a/maps_managers/easynav_costmap_maps_manager/src/easynav_costmap_maps_manager/CostmapMapsManager.cpp +++ b/maps_managers/easynav_costmap_maps_manager/src/easynav_costmap_maps_manager/CostmapMapsManager.cpp @@ -24,7 +24,7 @@ #include "easynav_costmap_maps_manager/map_io.hpp" #include "easynav_common/RTTFBuffer.hpp" -#include "ament_index_cpp/get_package_share_directory.hpp" +#include "ament_index_cpp/get_package_share_path.hpp" #include "ament_index_cpp/get_package_prefix.hpp" namespace easynav @@ -110,7 +110,7 @@ CostmapMapsManager::on_initialize() map_path_ = "/tmp/default.map.yaml"; if (!package_name.empty() && !map_path_file.empty()) { try { - const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); + const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); map_path_ = pkgpath + std::string("/") + map_path_file; } catch (ament_index_cpp::PackageNotFoundError & ex) { throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); diff --git a/maps_managers/easynav_navmap_maps_manager/src/easynav_navmap_maps_manager/NavMapMapsManager.cpp b/maps_managers/easynav_navmap_maps_manager/src/easynav_navmap_maps_manager/NavMapMapsManager.cpp index aa0d04e..2e9bdf4 100644 --- a/maps_managers/easynav_navmap_maps_manager/src/easynav_navmap_maps_manager/NavMapMapsManager.cpp +++ b/maps_managers/easynav_navmap_maps_manager/src/easynav_navmap_maps_manager/NavMapMapsManager.cpp @@ -26,7 +26,7 @@ #include "navmap_ros/navmap_io.hpp" #include "easynav_navmap_maps_manager/map_io.hpp" -#include "ament_index_cpp/get_package_share_directory.hpp" +#include "ament_index_cpp/get_package_share_path.hpp" #include "ament_index_cpp/get_package_prefix.hpp" namespace easynav @@ -122,7 +122,7 @@ NavMapMapsManager::on_initialize() if (!package_name.empty() && !occmap_path_file.empty()) { try { - const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); + const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); map_path_ = pkgpath + std::string("/") + occmap_path_file; } catch (ament_index_cpp::PackageNotFoundError & ex) { throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); @@ -145,7 +145,7 @@ NavMapMapsManager::on_initialize() if (!package_name.empty() && !navmap_path_file.empty()) { try { - const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); + const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); map_path_ = pkgpath + std::string("/") + navmap_path_file; } catch (ament_index_cpp::PackageNotFoundError & ex) { throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); diff --git a/maps_managers/easynav_octomap_maps_manager/src/easynav_octomap_maps_manager/OctomapMapsManager.cpp b/maps_managers/easynav_octomap_maps_manager/src/easynav_octomap_maps_manager/OctomapMapsManager.cpp index e8e1a6c..c79fd50 100644 --- a/maps_managers/easynav_octomap_maps_manager/src/easynav_octomap_maps_manager/OctomapMapsManager.cpp +++ b/maps_managers/easynav_octomap_maps_manager/src/easynav_octomap_maps_manager/OctomapMapsManager.cpp @@ -29,7 +29,7 @@ #include "pcl/point_cloud.h" #include "pcl/filters/voxel_grid.h" -#include "ament_index_cpp/get_package_share_directory.hpp" +#include "ament_index_cpp/get_package_share_path.hpp" #include "ament_index_cpp/get_package_prefix.hpp" namespace easynav @@ -113,7 +113,7 @@ OctomapMapsManager::on_initialize() // if (!package_name.empty() && !occmap_path_file.empty()) { // try { -// const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); +// const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); // map_path_ = pkgpath + std::string("/") + occmap_path_file; // } catch (ament_index_cpp::PackageNotFoundError & ex) { // throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); @@ -136,7 +136,7 @@ OctomapMapsManager::on_initialize() // // if (!package_name.empty() && !octomap_path_file.empty()) { // try { -// const std::string pkgpath = ament_index_cpp::get_package_share_directory(package_name); +// const std::string pkgpath = ament_index_cpp::get_package_share_path(package_name); // map_path_ = pkgpath + std::string("/") + occmap_path_file; // } catch (ament_index_cpp::PackageNotFoundError & ex) { // throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what()); diff --git a/maps_managers/easynav_routes_maps_manager/src/easynav_routes_maps_manager/RoutesMapsManager.cpp b/maps_managers/easynav_routes_maps_manager/src/easynav_routes_maps_manager/RoutesMapsManager.cpp index 3c0645f..d12884b 100644 --- a/maps_managers/easynav_routes_maps_manager/src/easynav_routes_maps_manager/RoutesMapsManager.cpp +++ b/maps_managers/easynav_routes_maps_manager/src/easynav_routes_maps_manager/RoutesMapsManager.cpp @@ -21,7 +21,7 @@ #include -#include "ament_index_cpp/get_package_share_directory.hpp" +#include "ament_index_cpp/get_package_share_path.hpp" #include "rclcpp/rclcpp.hpp" @@ -84,8 +84,8 @@ void RoutesMapsManager::on_initialize() // Absolute path: ignore package_name. map_path_ = map_path_file; } else if (!package_name.empty() && !map_path_file.empty()) { - const auto pkgpath = ament_index_cpp::get_package_share_directory(package_name); - map_path_ = pkgpath + "/" + map_path_file; + const auto pkgpath = ament_index_cpp::get_package_share_path(package_name); + map_path_ = pkgpath / map_path_file; } else { throw std::runtime_error( "Parameters '" + plugin_name + ".package' and '" + plugin_name + diff --git a/maps_managers/easynav_simple_maps_manager/src/easynav_simple_maps_manager/SimpleMapsManager.cpp b/maps_managers/easynav_simple_maps_manager/src/easynav_simple_maps_manager/SimpleMapsManager.cpp index 7675162..2681b6e 100644 --- a/maps_managers/easynav_simple_maps_manager/src/easynav_simple_maps_manager/SimpleMapsManager.cpp +++ b/maps_managers/easynav_simple_maps_manager/src/easynav_simple_maps_manager/SimpleMapsManager.cpp @@ -19,7 +19,7 @@ #include "easynav_simple_maps_manager/SimpleMapsManager.hpp" #include "easynav_sensors/types/PointPerception.hpp" -#include "ament_index_cpp/get_package_share_directory.hpp" +#include "ament_index_cpp/get_package_share_path.hpp" #include "ament_index_cpp/get_package_prefix.hpp" #include "easynav_common/YTSession.hpp" @@ -62,7 +62,7 @@ SimpleMapsManager::on_initialize() if (package_name != "" && map_path_file != "") { std::string pkgpath; try { - pkgpath = ament_index_cpp::get_package_share_directory(package_name); + pkgpath = ament_index_cpp::get_package_share_path(package_name); map_path_ = pkgpath + "/" + map_path_file; } catch(ament_index_cpp::PackageNotFoundError & ex) { throw std::runtime_error("Package " + package_name + " not found. Error: " + ex.what());