diff --git a/.circleci/config.yml b/.circleci/config.yml index ac878e3712..7105d4ed55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,12 +33,12 @@ _commands: - restore_cache: name: Restore Cache << parameters.key >> keys: - - "<< parameters.key >>-v1\ + - "<< parameters.key >>-v3\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ -{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}" - - "<< parameters.key >>-v1\ + - "<< parameters.key >>-v3\ -{{ arch }}\ -main\ -\ @@ -58,7 +58,7 @@ _commands: steps: - save_cache: name: Save Cache << parameters.key >> - key: "<< parameters.key >>-v1\ + key: "<< parameters.key >>-v3\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ diff --git a/nav2_bringup/bringup/CHANGELOG.rst b/nav2_bringup/CHANGELOG.rst similarity index 100% rename from nav2_bringup/bringup/CHANGELOG.rst rename to nav2_bringup/CHANGELOG.rst diff --git a/nav2_bringup/bringup/CMakeLists.txt b/nav2_bringup/CMakeLists.txt similarity index 100% rename from nav2_bringup/bringup/CMakeLists.txt rename to nav2_bringup/CMakeLists.txt diff --git a/nav2_bringup/bringup/README.md b/nav2_bringup/README.md similarity index 100% rename from nav2_bringup/bringup/README.md rename to nav2_bringup/README.md diff --git a/nav2_bringup/bringup/launch/bringup_launch.py b/nav2_bringup/launch/bringup_launch.py similarity index 100% rename from nav2_bringup/bringup/launch/bringup_launch.py rename to nav2_bringup/launch/bringup_launch.py diff --git a/nav2_bringup/bringup/launch/localization_launch.py b/nav2_bringup/launch/localization_launch.py similarity index 100% rename from nav2_bringup/bringup/launch/localization_launch.py rename to nav2_bringup/launch/localization_launch.py diff --git a/nav2_bringup/bringup/launch/multi_tb3_simulation_launch.py b/nav2_bringup/launch/multi_tb3_simulation_launch.py similarity index 99% rename from nav2_bringup/bringup/launch/multi_tb3_simulation_launch.py rename to nav2_bringup/launch/multi_tb3_simulation_launch.py index 81977af745..d91c5ce063 100644 --- a/nav2_bringup/bringup/launch/multi_tb3_simulation_launch.py +++ b/nav2_bringup/launch/multi_tb3_simulation_launch.py @@ -17,7 +17,7 @@ This is an example on how to create a launch file for spawning multiple robots into Gazebo and launch multiple instances of the navigation stack, each controlling one robot. -The robots co-exist on a shared environment and are controlled by independent nav stacks +The robots co-exist on a shared environment and are controlled by independent nav stacks. """ import os diff --git a/nav2_bringup/bringup/launch/navigation_launch.py b/nav2_bringup/launch/navigation_launch.py similarity index 100% rename from nav2_bringup/bringup/launch/navigation_launch.py rename to nav2_bringup/launch/navigation_launch.py diff --git a/nav2_bringup/bringup/launch/rviz_launch.py b/nav2_bringup/launch/rviz_launch.py similarity index 100% rename from nav2_bringup/bringup/launch/rviz_launch.py rename to nav2_bringup/launch/rviz_launch.py diff --git a/nav2_bringup/bringup/launch/slam_launch.py b/nav2_bringup/launch/slam_launch.py similarity index 100% rename from nav2_bringup/bringup/launch/slam_launch.py rename to nav2_bringup/launch/slam_launch.py diff --git a/nav2_bringup/bringup/launch/tb3_simulation_launch.py b/nav2_bringup/launch/tb3_simulation_launch.py similarity index 100% rename from nav2_bringup/bringup/launch/tb3_simulation_launch.py rename to nav2_bringup/launch/tb3_simulation_launch.py diff --git a/nav2_bringup/bringup/maps/turtlebot3_world.pgm b/nav2_bringup/maps/turtlebot3_world.pgm similarity index 100% rename from nav2_bringup/bringup/maps/turtlebot3_world.pgm rename to nav2_bringup/maps/turtlebot3_world.pgm diff --git a/nav2_bringup/bringup/maps/turtlebot3_world.yaml b/nav2_bringup/maps/turtlebot3_world.yaml similarity index 100% rename from nav2_bringup/bringup/maps/turtlebot3_world.yaml rename to nav2_bringup/maps/turtlebot3_world.yaml diff --git a/nav2_bringup/bringup/package.xml b/nav2_bringup/package.xml similarity index 100% rename from nav2_bringup/bringup/package.xml rename to nav2_bringup/package.xml diff --git a/nav2_bringup/bringup/params/nav2_multirobot_params_1.yaml b/nav2_bringup/params/nav2_multirobot_params_1.yaml similarity index 100% rename from nav2_bringup/bringup/params/nav2_multirobot_params_1.yaml rename to nav2_bringup/params/nav2_multirobot_params_1.yaml diff --git a/nav2_bringup/bringup/params/nav2_multirobot_params_2.yaml b/nav2_bringup/params/nav2_multirobot_params_2.yaml similarity index 100% rename from nav2_bringup/bringup/params/nav2_multirobot_params_2.yaml rename to nav2_bringup/params/nav2_multirobot_params_2.yaml diff --git a/nav2_bringup/bringup/params/nav2_params.yaml b/nav2_bringup/params/nav2_params.yaml similarity index 100% rename from nav2_bringup/bringup/params/nav2_params.yaml rename to nav2_bringup/params/nav2_params.yaml diff --git a/nav2_bringup/bringup/rviz/nav2_default_view.rviz b/nav2_bringup/rviz/nav2_default_view.rviz similarity index 100% rename from nav2_bringup/bringup/rviz/nav2_default_view.rviz rename to nav2_bringup/rviz/nav2_default_view.rviz diff --git a/nav2_bringup/bringup/rviz/nav2_namespaced_view.rviz b/nav2_bringup/rviz/nav2_namespaced_view.rviz similarity index 100% rename from nav2_bringup/bringup/rviz/nav2_namespaced_view.rviz rename to nav2_bringup/rviz/nav2_namespaced_view.rviz diff --git a/nav2_bringup/bringup/urdf/turtlebot3_waffle.urdf b/nav2_bringup/urdf/turtlebot3_waffle.urdf similarity index 100% rename from nav2_bringup/bringup/urdf/turtlebot3_waffle.urdf rename to nav2_bringup/urdf/turtlebot3_waffle.urdf diff --git a/nav2_bringup/bringup/worlds/waffle.model b/nav2_bringup/worlds/waffle.model similarity index 100% rename from nav2_bringup/bringup/worlds/waffle.model rename to nav2_bringup/worlds/waffle.model diff --git a/nav2_bringup/bringup/worlds/world_only.model b/nav2_bringup/worlds/world_only.model similarity index 100% rename from nav2_bringup/bringup/worlds/world_only.model rename to nav2_bringup/worlds/world_only.model