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

Move Nav2 CI to 24.04 / Rolling #4298

Merged
merged 42 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
16c37cb
Fix devcontainer
tonynajjar May 4, 2024
6ce2187
fix
tonynajjar May 4, 2024
fc3c5fe
.
tonynajjar May 4, 2024
5045bd7
.
tonynajjar May 4, 2024
40976ea
.
tonynajjar May 4, 2024
a582494
fix
tonynajjar May 6, 2024
56372f0
pr comments
tonynajjar May 6, 2024
481b777
bust cache
tonynajjar May 6, 2024
17b434e
test with docker image
tonynajjar May 6, 2024
6699cb5
Revert "test with docker image"
tonynajjar May 6, 2024
476050c
Merge branch 'ros-navigation:main' into fix-devcontainer
tonynajjar May 15, 2024
ffdd515
fixes
tonynajjar May 15, 2024
e451b1c
fixes
tonynajjar May 15, 2024
f17374e
remove comment
tonynajjar May 15, 2024
abda167
Update URI for new GitHub org and GHCR repo
ruffsl May 17, 2024
1c5a90c
replace fix
tonynajjar May 18, 2024
10bade2
replace fix
tonynajjar May 18, 2024
fd719ff
ignore maybe uninitialized error
tonynajjar May 18, 2024
75a6282
inline comment
tonynajjar May 21, 2024
b676fc5
fix linting
tonynajjar May 21, 2024
7c0a9ac
Add comments
tonynajjar May 21, 2024
6fc3344
fix bt test
tonynajjar May 21, 2024
7034a1d
fix nav2 test
tonynajjar May 21, 2024
32dfd1c
fix waypoint follower test
tonynajjar May 21, 2024
ebd9fcb
More improvements towards Jazzy migration
SteveMacenski May 21, 2024
2b48c37
fix more tests
SteveMacenski May 22, 2024
d7b3c83
do a few more
SteveMacenski May 22, 2024
974e051
last for the day
SteveMacenski May 22, 2024
f77277f
fix remaining BT tests
SteveMacenski May 22, 2024
19940fb
fixing last test issues
SteveMacenski May 22, 2024
7d9aa4c
Merge remote-tracking branch 'upstream/BR2' into fix-devcontainer
tonynajjar May 23, 2024
4bc062c
change linting image
tonynajjar May 23, 2024
f671d38
comment out tests needing gazebo
tonynajjar May 23, 2024
1b559a8
Merge remote-tracking branch 'origin/main' into fix-devcontainer
tonynajjar May 23, 2024
c3ecef9
break the cache cuz why not
tonynajjar May 23, 2024
93bd849
fix dynamic param test
tonynajjar May 23, 2024
ffb9ea0
revert changes to test_bt_utils
tonynajjar May 23, 2024
12588f5
fix dyn param
tonynajjar May 23, 2024
80d5238
comment out turtlebot3_gazebo
tonynajjar May 28, 2024
fdd0660
test with spin_all
tonynajjar May 28, 2024
ffb8584
Update Dockerfile
SteveMacenski May 28, 2024
8246c78
Update .circleci/config.yml
SteveMacenski May 28, 2024
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
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"build": {
"dockerfile": "../Dockerfile",
"context": "..",
"target": "visualizer",
"target": "dever",
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
"cacheFrom": "ghcr.io/ros-planning/navigation2:main"
},
"runArgs": [
"--name=nav2"
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
// "--cap-add=SYS_PTRACE", // enable debugging, e.g. gdb
// "--ipc=host", // shared memory transport with host, e.g. rviz GUIs
// "--network=host", // network access to host interfaces, e.g. eth0
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ RUN apt-get update && \
ros-$ROS_DISTRO-rmw-fastrtps-cpp \
ros-$ROS_DISTRO-rmw-connextdds \
ros-$ROS_DISTRO-rmw-cyclonedds-cpp \
&& pip3 install \
&& pip3 install --break-system-packages \
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
fastcov \
git+https://github.com/ruffsl/colcon-cache.git@a937541bfc496c7a267db7ee9d6cceca61e470ca \
git+https://github.com/ruffsl/colcon-clean.git@a7f1074d1ebc1a54a6508625b117974f2672f2a9 \
Expand Down Expand Up @@ -101,6 +101,8 @@ RUN . $UNDERLAY_WS/install/setup.sh && \
--from-paths src \
--skip-keys " \
slam_toolbox \
turtlebot3_gazebo \
gazebo_ros_pkgs \
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
"\
--ignore-src \
&& rm -rf /var/lib/apt/lists/*
Expand Down Expand Up @@ -145,7 +147,7 @@ RUN apt-get update && \
bash-completion \
gdb \
wget && \
pip3 install \
pip3 install --break-system-packages \
bottle \
glances

Expand Down
2 changes: 1 addition & 1 deletion nav2_common/cmake/nav2_package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ macro(nav2_package)
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC -Wshadow -Wnull-dereference)
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC -Wnull-dereference)
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>")
endif()

Expand Down
6 changes: 4 additions & 2 deletions nav2_map_server/CMakeLists.txt
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ find_package(std_msgs REQUIRED)
find_package(tf2 REQUIRED)
find_package(nav2_util REQUIRED)
find_package(GRAPHICSMAGICKCPP REQUIRED)
find_package(yaml-cpp REQUIRED)

nav2_package()

Expand Down Expand Up @@ -118,7 +119,8 @@ target_include_directories(${map_io_library_name} SYSTEM PRIVATE
${GRAPHICSMAGICKCPP_INCLUDE_DIRS})

target_link_libraries(${map_io_library_name}
${GRAPHICSMAGICKCPP_LIBRARIES})
${GRAPHICSMAGICKCPP_LIBRARIES}
yaml-cpp::yaml-cpp)

if(WIN32)
target_compile_definitions(${map_io_library_name} PRIVATE
Expand Down Expand Up @@ -160,5 +162,5 @@ ament_export_libraries(
${library_name}
${map_io_library_name}
)
ament_export_dependencies(${map_io_dependencies} ${map_server_dependencies})
ament_export_dependencies(${map_io_dependencies} ${map_server_dependencies} yaml-cpp)
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
ament_package()
2 changes: 1 addition & 1 deletion nav2_mppi_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if(COMPILER_SUPPORTS_FMA)
endif()

# If building one the same hardware to be deployed on, try `-march=native`!
add_compile_options(-O3 -finline-limit=10000000 -ffp-contract=fast -ffast-math -mtune=generic)
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
add_compile_options(-O3 -ffp-contract=fast -ffast-math -mtune=generic)

add_library(mppi_controller SHARED
src/controller.cpp
Expand Down
4 changes: 2 additions & 2 deletions nav2_system_tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package(visualization_msgs REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(std_msgs REQUIRED)
find_package(tf2_geometry_msgs REQUIRED)
find_package(gazebo_ros_pkgs REQUIRED)
# find_package(gazebo_ros_pkgs REQUIRED)
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
find_package(nav2_amcl REQUIRED)
find_package(nav2_lifecycle_manager REQUIRED)
find_package(rclpy REQUIRED)
Expand All @@ -37,7 +37,7 @@ set(dependencies
nav2_amcl
nav2_lifecycle_manager
nav2_behavior_tree
gazebo_ros_pkgs
# gazebo_ros_pkgs
geometry_msgs
std_msgs
tf2_geometry_msgs
Expand Down
4 changes: 0 additions & 4 deletions tools/underlay.repos
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ repositories:
# type: git
# url: https://github.com/cra-ros-pkg/robot_localization.git
# version: ros2
# ros-simulation/gazebo_ros_pkgs:
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
# type: git
# url: https://github.com/ros-simulation/gazebo_ros_pkgs.git
# version: ros2
# ros2/geometry2:
# type: git
# url: https://github.com/ros2/geometry2.git
Expand Down
Loading