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
10 changes: 4 additions & 6 deletions .github/workflows/rolling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <yaml-cpp/yaml.h>

#include "ament_index_cpp/get_package_share_directory.hpp"
#include "ament_index_cpp/get_package_share_path.hpp"

#include "rclcpp/rclcpp.hpp"

Expand Down Expand Up @@ -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 +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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());
Expand Down
Loading