Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: treat several build issues on rolling #458

Merged
merged 6 commits into from
May 26, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/colcon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
apt update
rosdep update
source /opt/ros/${{matrix.config.rosdistro}}/setup.bash
rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox turtlebot3_gazebo gazebo_ros_pkgs"
rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox turtlebot3_gazebo gazebo_ros_pkgs octomap_server"
shell: bash
- name: Colcon Build (Release)
run: |
Expand Down
7 changes: 7 additions & 0 deletions grid_map_core/test/EigenPluginsTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@

#include "grid_map_core/grid_map_core.hpp"

// GCC 13 has false positive warnings around array-bounds.
// Suppress them until this is fixed in upstream gcc. See
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114758 for more details.
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif

TEST(EigenMatrixBaseAddons, numberOfFinites)
{
Expand Down
8 changes: 8 additions & 0 deletions grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
#include <string>
#include <limits>

// GCC 13 has false positive warnings around stringop-overflow.
// Suppress them until this is fixed in upstream gcc. See
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114758 for more details.
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif

namespace grid_map
{

Expand Down
12 changes: 12 additions & 0 deletions grid_map_filters/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ if(BUILD_TESTING)
list(APPEND AMENT_LINT_AUTO_EXCLUDE
ament_cmake_cpplint
ament_cmake_copyright
ament_cmake_uncrustify
)
ament_lint_auto_find_test_dependencies()

Expand All @@ -144,6 +145,17 @@ if(BUILD_TESTING)
ament_cpplint(
FILTERS -legal/copyright -build/include_order
)

# run uncrustify except for EigenLab.hpp
find_package(ament_cmake_uncrustify)
set(
_linter_excludes
include/EigenLab/EigenLab.hpp
)
ament_uncrustify(
EXCLUDE ${_linter_excludes}
LANGUAGE c++
)
endif()
ament_lint_auto_find_test_dependencies()
endif()
Expand Down
2 changes: 1 addition & 1 deletion grid_map_ros/src/GridMapRosConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ bool GridMapRosConverter::saveToBag(

auto bag_message = std::make_shared<rosbag2_storage::SerializedBagMessage>();

auto ret = rcutils_system_time_now(&bag_message->time_stamp);
auto ret = rcutils_system_time_now(&bag_message->send_timestamp);
if (ret != RCL_RET_OK) {
RCLCPP_ERROR(rclcpp::get_logger("saveToBag"), "couldn't assign time rosbag message");
}
Expand Down
5 changes: 3 additions & 2 deletions tools/ros2_dependencies.repos
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
repositories:
ros-planning/navigation2:
type: git
url: https://github.com/ros-planning/navigation2.git
version: main
# back to upstream main after https://github.com/ros-navigation/navigation2/pull/4298 is merged
url: https://github.com/tonynajjar/navigation2.git
version: fix-devcontainer