Skip to content

Commit 848ec02

Browse files
tonynajjarruffslSteveMacenski
authored andcommitted
Move Nav2 CI to 24.04 / Rolling (ros-navigation#4298)
* Fix devcontainer * fix * . * . * . * fix * pr comments * bust cache * test with docker image * Revert "test with docker image" This reverts commit 17b434e. * fixes * fixes * remove comment * Update URI for new GitHub org and GHCR repo * replace fix * replace fix * ignore maybe uninitialized error * inline comment * fix linting * Add comments * fix bt test * fix nav2 test * fix waypoint follower test * More improvements towards Jazzy migration * fix more tests * do a few more * last for the day * fix remaining BT tests * fixing last test issues * change linting image * comment out tests needing gazebo * break the cache cuz why not * fix dynamic param test * revert changes to test_bt_utils * fix dyn param * comment out turtlebot3_gazebo * test with spin_all * Update Dockerfile Signed-off-by: Steve Macenski <[email protected]> * Update .circleci/config.yml Signed-off-by: Steve Macenski <[email protected]> --------- Signed-off-by: Steve Macenski <[email protected]> Co-authored-by: Ruffin <[email protected]> Co-authored-by: Steve Macenski <[email protected]>
1 parent c58e235 commit 848ec02

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.circleci/config.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ _commands:
8282
- run:
8383
name: Install Dependencies | << parameters.workspace >>
8484
working_directory: << parameters.workspace >>
85+
# Remove/Replace turtlebot3_gazebo and gazebo_ros_pkgs from --skip-keys after https://github.com/ros-navigation/navigation2/pull/3634
8586
command: |
8687
. << parameters.underlay >>/install/setup.sh
8788
AMENT_PREFIX_PATH=$(echo "$AMENT_PREFIX_PATH" | \
@@ -96,11 +97,6 @@ _commands:
9697
(echo vcs_export && cat) >> lockfile.txt
9798
sha256sum $PWD/lockfile.txt >> lockfile.txt
9899
99-
# Temp: Rolling transition to 24.04 leaves rosdep in 22.04 in the lurch
100-
# This replaces main rosdep index with the last prior to release: Feb 28, 2024
101-
sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-02-28|" /etc/ros/rosdep/sources.list.d/20-default.list
102-
export ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-02-28/index-v4.yaml
103-
104100
apt-get update
105101
rosdep update --rosdistro $ROS_DISTRO
106102
dependencies=$(
@@ -109,6 +105,7 @@ _commands:
109105
--ignore-src \
110106
--skip-keys " \
111107
slam_toolbox \
108+
turtlebot3_gazebo \
112109
" \
113110
--verbose | \
114111
awk '$1 ~ /^resolution\:/' | \

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ RUN . $UNDERLAY_WS/install/setup.sh && \
102102
--from-paths src \
103103
--skip-keys " \
104104
slam_toolbox \
105+
turtlebot3_gazebo \
105106
"\
106107
--ignore-src \
107108
&& rm -rf /var/lib/apt/lists/*

nav2_behavior_tree/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ find_package(nav2_util REQUIRED)
2020

2121
nav2_package()
2222

23+
add_compile_options(-Wno-shadow) # Delete after https://github.com/BehaviorTree/BehaviorTree.CPP/issues/811 is released
24+
2325
include_directories(
2426
include
2527
)

0 commit comments

Comments
 (0)