Skip to content

Commit

Permalink
Fix build in ROS2 Foxy (#3)
Browse files Browse the repository at this point in the history
* Corrected check to detect collision (ros-navigation#1404) (ros-navigation#1601)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Script (ros-navigation#1599)

* Add eloquent option to build script and made it default

* Add eloquent in the error message

* Remove dashing

* setStatus(BT::NodeStatus::IDLE) removed (ros-navigation#1602)

the removed code has no effect at all: the status of a node will be its returned value!.

In general, you never set your status to IDLE, unless halted.

* Spin recovery (ros-navigation#1605)

* Corrected check to detect collision (ros-navigation#1404)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Changed collision check to detect only lethal and unknown cells (ros-navigation#1404)(ros-navigation#1603)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* making documentation distro agnostic (ros-navigation#1610)

* Issue 1608 segmentation fault planner server node master (ros-navigation#1612)

* corrected wrong indexing in NavfnPlanner::smoothApproachToGoal function

* resolved uncrustify errors

* corrected the condition inside NavfnPlanner::smoothApproachToGoal to replace last pose of computed path

Co-authored-by: chikmagalore.thilak <[email protected]>

* BehaviorTree refactoring (ros-navigation#1606)

* Proposed refactoring to avoid issues with CoroAction

* correctly haltAllActions (related to ros-navigation#1600)

* not really needed and will be deprecated soon

* Applying changes suggested in the comments of ros-navigation#1606

- fix haltAllActions
- changes method signature on_success()
- reverts the changes made here:
https://github.com/ros-planning/navigation2/pull/1515/files

* fix warnings and errors

* make uncrustify happy?

* Update bt_navigator.cpp

* Update bt_navigator.cpp

* uncrustify fix

Co-authored-by: [email protected] <Davide Faconti>

* Decide the output of BtServiceNode based on the service-response (ros-navigation#1615)

- `BtServiceNode::check_future()` was created, to encapsulate the logic
where a the output of the BtServiceNode is computed.
- Inherited classes can overload this function according to the requirement
of the user

* Add server_name parameter to BtActionNode (ros-navigation#1616)

A BT port is introduced in case the user wants to change the default action_name
of BtActionNode.

* Added thread synchronization to KinematicParameters (ros-navigation#1459) (ros-navigation#1621)

* Added thread synchronization to KinematicParameters (ros-navigation#1459)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Doxygen fix (ros-navigation#1459)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Docs (ros-navigation#1629)

* Updated website gifs (ros-navigation#1228)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Created new gifs (ros-navigation#1228)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Corrected gif name (ros-navigation#1228)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Allow reaction to cancellation and preemption on wait recovery plugin (ros-navigation#1636)

* Changed onCycleUpdate to allow preemption (ros-navigation#1622)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Deleted unnecessary wait and corrected style (ros-navigation#1622)

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Nav2 planner plugin tutorial (ros-navigation#1633)

* Nav2 planner plugin tutorial draft 1

* Reduced gif size

* Updated the config code block

* Remove RRTConnect plugin and add StraightLine plugin.

* Address reviewer's comments

* Add information about planners mapping in Navigation2

* Minor path fix for gif (ros-navigation#1638)

* Minor improvement on best practice for pluginlib export (ros-navigation#1637)

* Add caps to headers (ros-navigation#1639)

* Fix segfault in test_planner_random_node/test_planner_costmaps_node (ros-navigation#1640)

The problem appears while addressing zero-length path vector
after planner failed to create a plan.

* Fix trans_stopped_velocity comparison with x & y velocity (ros-navigation#1649)

Signed-off-by: Shrijit Singh <[email protected]>

* map_server refactor and cleanup (ros-navigation#1624)

* [WIP] map_server refactor and cleanup

nav2_map_server/mapio (map input-optput library):
* Move OccupancyGrid messages saving code from MapSaver::mapCallback()
  to saveMapToFile() function
* Rename and move try_write_map_to_file() MapSaver method
  to tryWriteMapToFile() function
* Move map saving parameters into one SaveParameters struct
* Reorganize map saving parameters verification code from MapSaver
  to new checkSaveParameters() function
* Correct logging for incorrect input cases in checkSaveParameters()
* Copy loadMapFromYaml() method from OccupancyGridLoader
* Move loadMapFromFile() method from OccupancyGridLoader
* Rename and move load_map_yaml() OccupancyGrid method
  to loadMapYaml() function
* Move LoadParameters struct from OccupancyGridLoader

nav2_map_server/map_saver:
* Completely re-work MapSaver node:
 - Switch MapSaver from rclcpp::Node to nav2_utils::LifecycleNode
 - Revise MapSaver node parameters model
 - Add saveMapTopicToFile() method for saving map from topic
 - Remove future-promise synchronization model as unnecessary
* Add "save_map" service with new SaveMap service messages
* Rename map_saver_cli.cpp -> map_saver_cli_main.cpp file
  and map_saver -> to map_saver_cli executable
* Add ability to save a map from custom topic ("-t" cli-option)
* Restore support of "--ros-args" remappings
* Update help message in map_saver_cli
* New map_saver_server_main.cpp file and map_saver_server executable:
  continuously running server node
* New launch/map_saver_server.launch.py: map_saver_server launcher

nav2_map_server/map_server:
* Revise MapServer node parameters model
* Rename loadMapFromYaml() -> loadMapResponseFromYaml()
* Add node prefix to "map" and "load_map" service names
* Fix crash: dereferencing nullptr in map_server running as a node
  while handling of incorrect input map name
* Add updateMsgHeader() method for correcting map message header
  when it belongs to instantiated object
* Rename main.cpp -> map_server_main.cpp file
* Minor changes and renames to keep unified code style

nav2_util/map_loader:
* Remove as duplicating of loadMapFromFile() from MapIO library

other:
* Update nav2_map_server/README
* Fix testcases

* Fixes for cpplint, uncrustify, flake8 and test_occ_grid_node failures

* Fixing review comments

* Rename mapio -> map_io
* Move all OccGridLoader functionality into MapServer. Remove OccGridLoader
* Switch all thresholds to be floating-point
* Switch loadMapFromYaml() returning type to LOAD_MAP_STATUS and remove
  duplicating code from loadMapResponseFromYaml()
* Make mapCallback() to be lambda-function
* Make saveMapCallback() to be class method
* Utilize local rclcpp_node_ from LifecycleNode instead of map_listener_.
  Remove map_listener_ and got_map_msg_ variables.
* Rename load_map_callback() -> loadMapCallback() and make it to be class method
* Rename handle_occ_callback() -> getMapCallback() and make it to be class method
* Force saveMapTopicToFile() and saveMapToFile() to work with constant arguments
* map_saver_cli: move arguments parsing code into new parse_arguments() function
* Rename test_occ_grid_node -> test_map_server_node and fix test
* Rename test_occ_grid -> test_occ_grid and fix test
* Fix copyrights
* Fix comments
* Update README

* Increase test coverage

* Fixing review comments

* Separate map_server and map_saver sources
* Fix copyrights
* Suppress false-positive uncrustify failure

* Map Server docs update for Foxy (ros-navigation#1650)

* Map Server docs update for Foxy

* Fixes after review

* Add brief description of map_io

* Initialize variabes to avoid errors during build (ros-navigation#1654)

Signed-off-by: Pablo Vega <[email protected]>

* Temporarily remove planner tests (ros-navigation#1656)

* Replace deprecated ament_export_interfaces

* Revert edf9b9a

Accidental commit into github ui

* remove docs from navigation2 repo (ros-navigation#1657)

* Update hyperlinks in readme for new website docs (ros-navigation#1668)

* Update hyperlinks in readme for new website docs

* Adding link to join slack

* Ignore codecov paths in tests (ros-navigation#1671)

* Ignore codecov paths in tests

* adding missing string test case for stripping leading slash

* Update test_string_utils.cpp

* Update test_string_utils.cpp

* Update codecov.yml

* Update codecov.yml

* Update codecov.yml

* Update codecov.yml

* Fix bug in the condition to publish local plan (ros-navigation#1674)

Signed-off-by: Francisco Martin Rico <[email protected]>

* Fix infinite rotation in Spin recovery when angle > PI (ros-navigation#1670)

* Fix infinite rotation in Spin recovery when angle > PI

* Add test for spin recovery

* Fix formatting

* Add general optimizations

* Fix copyright

* Add weights to AMCL particle cloud (ros-navigation#1677)

* Add Particle and ParticleCloud msgs to publish amcl particle cloud with weights

* Add deprecation warning

* Remove dead code from navfn planner (ros-navigation#1682)

* adding wait recovery integration test (ros-navigation#1685)

* adding recovery wait test

* adding copy rights

* fixing gaurds

* Add ignoring code cov any files named test_ (ros-navigation#1691)

* Add ignoring code cov any files named test_

* Update slack URL

* Update codecov.yml

* Replace current cell reference with copy (ros-navigation#1690)

The cell reference becomes invalidated as the reference becomes invalid when a new  cell is added to the vector

Signed-off-by: Shrijit Singh <[email protected]>

* Fix segfault in test_planner_random_node (ros-navigation#1694)

deactivate needs to be called before cleanup
to stop the mapUpdateLoop()

Signed-off-by: Siddarth Gore <[email protected]>

* Adding more simple action server, nav2_utils, and lifecycle bringup CLI tests (ros-navigation#1695)

* adding tests to simple action server and fixed bug

* more test coverage in nav2_utils

* testing lifecycle cli program

* shifting action server test around for stability

* adding test temp commented out

* flake

* w/o resetting

* Change publishers to publish unique ptrs (ros-navigation#1673)

* Change publishers to publish unique ptrs

* Revert test case modification

* Update function signature to receive unique_ptrs

* Update publishers in nav2_costmap_2d to publish unique ptrs

* Update publishers in nav2_planner and nav2_map_server

* Change nav2_map_server publisher to publish occupancy grid unique ptr

* Change publisher in nav2_planner to publish path unique ptr

* Remove smart pointer return from functions in nav2_costmap_2d

* Run cpp_lint manually in nav2_costmap_2d

* Minor fixes

* Adhere to conventions of smart pointers passing to function

* Change publisher in dwb_core to publish unique pointer

* update for BT.cpp master (ros-navigation#1714)

* Update CI for ROS2 Foxy (ros-navigation#1684)

* Update Dockerfile

* Update repo paths

* Copy all of workspaceto include .repo files expected by CI in image

* Patch Docker and CI for missing gazebo 11
Revert once gazebo 11 is ready

* Disable connext for now

* Disable debug jobs in nightly workflow

* Remove unused install_deployment_key refrence

* Update the release Dockerfile

* Use buildkit to speed up loacal builds

* Add example of running tests

* Roll back BTcpp and no-error deprecated warnings

* Revert "Roll back BTcpp and no-error deprecated warnings"

This reverts commit 301eb54.

* Move extra Dockerfiles to tools folder

* Replace deprecated ament_export_interfaces (ros-navigation#1669)

with ament_export_targets
See notice here:
https://index.ros.org/doc/ros2/Releases/Release-Foxy-Fitzroy/

* Refactor rclcpp::executor::FutureReturnCode deprecation (ros-navigation#1702)

* Refactor deprecated code

* Add ompl repo (for test)

* Fix indent

* Remove OMPL

* Fix cppcheck errors (ros-navigation#1718)

* Fix cppcheck errors

Signed-off-by: Sarthak Mittal <[email protected]>

* Fix test name generator

* Fix returning after it is deallocated / released error

* Increase sleep to 10 seconds to allow map server node to start up

* Fix infinite wait for service in nav2_map_server tests

* [WIP] Checking line coverage in codecov (ros-navigation#1713)

* Add parsers options

* Disable all branch detection option

* Replace lcov with gcov

* Revert changes in codecov.yaml and remove branch coverage from coverage bash script

* [master] Windows bring-up (ros-navigation#1704)

* Windows bringup.

* nullity check.

* nullity check.

* Added goal updated condition node (ros-navigation#1712)

* Added goal updated condition node

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Updated bt_navigator readme and added missing failure condition

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Updated bt_navigator readme

Signed-off-by: Aitor Miguel Blanco <[email protected]>

* Update nav2_bt_navigator/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Update nav2_bt_navigator/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Update nav2_bt_navigator/README.md

Co-authored-by: Steve Macenski <[email protected]>

Co-authored-by: Steve Macenski <[email protected]>

* Tf timeout (ros-navigation#1724)

* Parameterized tf_timeout in amcl
* Refactored the existing transform_tolerance parameter in amcl to transform_publish_shift.
* Refactored tf_buffer method calls to use transform_tolerance according to [978].

* Added tf_timeout to static_layer and observation_buffer

* declared transform_tolerance parameter

* change transform_tolerance default value

Co-authored-by: Steve Macenski <[email protected]>

* Removed transform_publish_shift param

* Fixed linting errors

Co-authored-by: Steve Macenski <[email protected]>

* Fix system_tests flaky issue (ros-navigation#1723)

* Return back planning system tests

* Fix testcase failure related to not updating costmap

This appeared while compiler treated costmap pointer
to be unused and optimized it out

* Fix flake8 E128 failure

* Fix uninitialized variable warnings and change default value (ros-navigation#1728)

* Fix uninitialized warning for variable temp_tf_tol.

* Change default GridBased.tolerance to 0.5 meters

* Add DistanceController decorator node (ros-navigation#1699)

* Add DistanceController decorator node

Signed-off-by: Sarthak Mittal <[email protected]>

* Update documentation and rename behavior tree XMLs

* Add tests for distance controller

* Fix test

* Update readme and add BT image

* Rename test files

* Remove protected setStatus calls

* Add option to inflate unknown space (ros-navigation#1675)

* Add option to inflate around unknown space

Signed-off-by: Shrijit Singh <[email protected]>

* Fix bug regarding lower bound of double in worldToMapEnforceBounds

Signed-off-by: Shrijit Singh <[email protected]>

* Convert 2D caches to 1D vectors for automatic memory management and better locality

Signed-off-by: Shrijit Singh <[email protected]>

* Add general optimizations and modern syntax

Signed-off-by: Shrijit Singh <[email protected]>

* Switch from map<double> to vector<> in using precached integer distances

Credits to original author from ros-planning/navigation#839

Signed-off-by: Shrijit Singh <[email protected]>

* Add tests for inflate_unknown and inflate_around_unknown

Signed-off-by: Shrijit Singh <[email protected]>

* Remove commented out assert

Signed-off-by: Shrijit Singh <[email protected]>

* Add BehaviorTree visualization support using Groot (ros-navigation#1725)

* Add BehaviorTree visualization support using Groot

* Add nav2 TreeNodesModel containing all BT Nodes used

* Add instructions on using Groot to visualize behavior trees

Signed-off-by: Sarathkrishnan Ramesh <[email protected]>

* Rearrange files and minor updates

* Move nav2_tree_nodes.xml and groot instruction to nav2_beahvior_tree

* Run cmake install rules for nav2_tree_nodes.xml

Signed-off-by: Sarathkrishnan Ramesh <[email protected]>

* Add distance controller node in nav2 TreeNodesModel

Signed-off-by: Sarathkrishnan Ramesh <[email protected]>

* Add collision checking for footprint without using subscibers. (ros-navigation#1703)

* Add collision checking for footprint without using subscibers.

* Address reviewer's comments

- Changed the design if the footprint collision checkers
- And propogate the changes to dependencies such as nav2_recoveries and nav2_core

* Remove some extra headers

* Remove debuging code

* Add requested test

* Change weird test names.

* Remove unorientFootprint function dependency

* Imporve tests

* Fix commented Varible

* Expose distance controller frames to ports (ros-navigation#1741)

* Add feedback in navigation2 actions (ros-navigation#1736)

* adding navigate to pose feedback and remove random crawl from master

* adding controller feedback

* recovery feedback actions

* Update nav2_controller/src/nav2_controller.cpp

Co-Authored-By: Carl Delsey <[email protected]>

* Add feedback in wait action and make general improvements

Signed-off-by: Sarthak Mittal <[email protected]>

* Fix rebase errors

* Make feedback reset across different goals

Co-authored-by: stevemacenski <[email protected]>
Co-authored-by: Carl Delsey <[email protected]>

* Switch to nightly tag for release image (ros-navigation#1746)

as tests for connext rmw have been disabled.54

* Parameterization of the tf_tol argument for getCurrentPose calls (ros-navigation#1735)

* parametrized collision_checker getCurrentPose timeout

* Parameterized tf_tol for spin and backup recoveries

* Parameterized tf_tol for goal_reached_condition

* moved transform_tolerance_ to recovery.hpp

* moved transform_tolerance parameter declaration to bt_navigator

* Fixed typo

* Fixed transform_tolerance_ location and transform_tolerance param declaration location

* Parameterized tf_tol for distance_controller.cpp

* Revert libgazebo11 workaround for CI (ros-navigation#1750)

* Revert libgazebo11 workaround

* Revert gazebo_ros_pkgs to main ros2 branch

* Resolves ros-navigation#938 (ros-navigation#1747)

The forward_point_distance used in the GoalAlign and PathAlign critics projects the current pose forward a default 0.325 meters before scoring the trajectory. This can cause velocities that create sharp turns into obstacles to be chosen (reproducible with the Turtlebot3 simulation).

For TB3, which is small in size, 0.325 meters is too far. Instead, enable GoalAlign and PathAlign critics in the DWB controller and shorten the critics' forward_point_distance (how far the current pose is project given the current orientation before scoring the trajectory) from the default 0.325 meters to 0.1 meters which improves stability when running with TB3.

Signed-off-by: Jack Pien <[email protected]>

* make basic failing test for tf2 wrapper (start of robot utils tests) (ros-navigation#1743)

* make basic failing test for tf2 wrapper

* add file :-)

* Run rosdep update in Dockerfile and CI (ros-navigation#1751)

So we don't have to wait for the nightly parent image to update rosdep

* Don't pass rosdistro when using empty index (ros-navigation#1752)

Context: osrf/docker_images#399

* Explicitly set junit_family parameter for nav2_gazebo_spawner tests (ros-navigation#1753)

* Parameterize frame IDs (ros-navigation#1742)

* Use parameterized frames (ros-planning#1726)

Signed-off-by: ymd-stella <[email protected]>

* Expore frame to ports in GoalReached and add params to bringu yaml files

* Fix recovery interface

* Update launch file and add recovery parameters to bringup yaml

* Remove lifecycle node params

* Update bringup param files

Signed-off-by: Sarthak Mittal <[email protected]>

* Fix cpplint error

* Fix nav2_recoveries cpplint errors

Co-authored-by: ymd-stella <[email protected]>

* Add the goal to NavFN tolerance region traversing algorithm (ros-navigation#1734)

* Consider the goal itself when looking to potential within tolerance region

* Fixed comments

* Re-enable nightly debug builds for codecov (ros-navigation#1760)

Looks like codecov analytics from merged PRs alone do not update codecov status for the master branch.
Re-enabling nightly debug builds to keep codecov status on master up-to-date

* Wait for initial pose and increase timeouts (ros-navigation#1759)

Initial pose is needed for the test to run
so it makes sense to wait for it till it times out.

* removed unused condition (ros-navigation#1769)

* Added use of declare_parameter_if_not_declared. (ros-navigation#1765)

* Added use of declare_parameter_if_not_declared.

* Fixed column width.

* Whitespace removal

* Style cleanup.

* a bugfix of clear costmap service action (ros-navigation#1764)

The following is an example of the error.
[ERROR] [1590171638.335693813] [bt_navigator]: Action server failed while executing action callback: "failed to send request: ros_request argument is null, at /opt/ros/src/ros2/rcl/rcl/src/rcl/client.c:278"a bugfix of clear costmap service action

Signed-off-by: Daisuke Sato <[email protected]>

* Add condition nodes for time and distance replanning (ros-navigation#1705)

* Add condition nodes and behavior tree to enable replan on new goal

Signed-off-by: Sarthak Mittal <[email protected]>

* Fix time expired and distance traveled conditions

* Remove new_goal_received from blackboard

* Fix IDLE check condition in new condition nodes

* Fix lint errors

* Fix lint errors

* Address reviewer's comments

Signed-off-by: Sarthak Mittal <[email protected]>

* Add tests

Signed-off-by: Sarthak Mittal <[email protected]>

* a patch for ros-navigation#1773 BT navigator nodes with use_sim_time (ros-navigation#1776)

Signed-off-by: Daisuke Sato <[email protected]>

* Replace deprecated launch params (ros-navigation#1778)

* Update deprecated launch params

Signed-off-by: Sarthak Mittal <[email protected]>

* Revert internal python changes

Signed-off-by: Sarthak Mittal <[email protected]>

* adding backup tests (ros-navigation#1774)

* adding backup tests

* add negative case

* correct termination logic

* increase speed

* fixish failure test case

* declared default_critic_namespaces param (ros-navigation#1785)

* List of parameters in the stack  (ros-navigation#1761)

* Initial commit

* Added AMCL params and some formatting fixes

* Added some missing params

* Added bt nodes ports

* fixed typo

* Added <> to base names + some reformating

* added default_critic_namespaces param to dwb_local_planner

* Fix some parameters not being passed to getCurrentPose (ros-navigation#1790)

Signed-off-by: ymd-stella <[email protected]>

* Add SLAM Toolbox and map_saver_server into launch-files (ros-navigation#1768)

* Add SLAM launch file

Fix possible collision of laser scan with camera on waffle

* Simplifications and fixes after review

* Increase save_map_timeout to 5 sec to comply with SLAM Toolbox map rate

* BT navigator conversion fix (ros-navigation#1793)

* include bt_conversions.hpp to convert input properly

Signed-off-by: Daisuke Sato <[email protected]>

* delete redundant include statement

Signed-off-by: Daisuke Sato <[email protected]>

* Add complete parameter description documentation (ros-navigation#1786)

* adding a bunch of parameter descriptions

* ading costmap param descriptions

* add AMCL parameters

* adding DWB params

* resolving review questions

* include planner and controller ID parameters

* fixing jack's requests

* Test for lifecycle manager (ros-navigation#1794)

* Add test

* Add more coverage

* Merge test header file with executable

* Address PR reviewer's comment

* Add some more coverage

* Revert accidental changes to localization_launch.py file.

* Update modified default_bt_xml_filename parameter (ros-navigation#1797)

Parameter ``bt_xml_filename`` has changed to ``default_bt_xml_filename``

Co-authored-by: Aitor Miguel Blanco <[email protected]>
Co-authored-by: Shivang Patel <[email protected]>
Co-authored-by: Davide Faconti <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>
Co-authored-by: crthilakraj <[email protected]>
Co-authored-by: chikmagalore.thilak <[email protected]>
Co-authored-by: Ashwin Bose <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Shrijit Singh <[email protected]>
Co-authored-by: p-vega <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Francisco Martín Rico <[email protected]>
Co-authored-by: Sarthak Mittal <[email protected]>
Co-authored-by: Siddarth Gore <[email protected]>
Co-authored-by: Sarathkrishnan Ramesh <[email protected]>
Co-authored-by: Sean Yen <[email protected]>
Co-authored-by: Marwan Taher <[email protected]>
Co-authored-by: TingChang <[email protected]>
Co-authored-by: Carl Delsey <[email protected]>
Co-authored-by: Jack Pien <[email protected]>
Co-authored-by: ymd-stella <[email protected]>
Co-authored-by: tgreier <[email protected]>
Co-authored-by: Daisuke Sato <[email protected]>
Co-authored-by: ymd-stella <[email protected]>
  • Loading branch information
1 parent 6141b2d commit 4e60a95
Show file tree
Hide file tree
Showing 335 changed files with 8,801 additions and 6,823 deletions.
85 changes: 4 additions & 81 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ references:
(echo vcs_export && cat) >> checksum.txt
sha256sum $PWD/checksum.txt >> checksum.txt
apt-get update
rosdep update
dependencies=$(
rosdep install -q -y \
--from-paths src \
Expand Down Expand Up @@ -276,37 +277,6 @@ references:
file: lcov/project_coverage.info
flags: project
when: always
setup_doc_dependencies: &setup_doc_dependencies
run:
name: Install Doc Dependencies
command: |
apk --no-cache add python3
python3 -m ensurepip
pip3 install sphinx==1.7.5 docutils==0.14 sphinx_rtd_theme breathe==4.9.1 sphinxcontrib-plantuml
apk --no-cache add make
apk --no-cache add doxygen
apk --no-cache add graphviz
apk --no-cache add ttf-dejavu
apk --no-cache add openjdk8-jre
apk --no-cache add bash git openssh
make_docs: &make_docs
run:
command: |
cd src/navigation2/sphinx_doc
make html
store_docs: &store_docs
store_artifacts:
path: /opt/overlay_ws/src/navigation2/sphinx_doc/_build/html
destination: html
publish_docs: &publish_docs
run:
command: |
cd src/navigation2/sphinx_doc
make publish
install_deployment_key: &install_deployment_key
add_ssh_keys:
fingerprints:
- "0e:8e:90:bf:3d:a9:04:d9:04:b4:62:38:a5:3b:90:7d"

commands:
<<: *common_commands
Expand Down Expand Up @@ -349,19 +319,6 @@ commands:
steps:
- *collect_overlay_coverage
- *upload_overlay_coverage
install_doc_dependencies:
description: "Install documentation dependencies"
steps:
- *setup_doc_dependencies
build_docs:
description: "Build docs"
steps:
- *make_docs
- *store_docs
publish_docs_to_gh_pages_branch:
description: "Commit newly built docs to gh-pages branch"
steps:
- *publish_docs

executors:
debug_exec:
Expand All @@ -382,12 +339,6 @@ executors:
CACHE_NONCE: "Release"
OVERLAY_MIXINS: "release ccache"
UNDERLAY_MIXINS: "release ccache"
docs_exec:
docker:
- image: alpine:latest
working_directory: /opt/overlay_ws
environment:
<<: *common_environment

jobs:
debug_build: &debug_build
Expand Down Expand Up @@ -424,25 +375,6 @@ jobs:
<<: *release_test
environment:
RMW_IMPLEMENTATION: "rmw_fastrtps_cpp"
docs_build:
executor: docs_exec
steps:
- install_doc_dependencies
- *on_checkout
- build_docs
- persist_to_workspace:
root: src/navigation2
paths:
- sphinx_doc
docs_publish:
executor: docs_exec
steps:
- install_doc_dependencies
- *on_checkout
- *install_deployment_key
- attach_workspace:
at: src/navigation2
- publish_docs_to_gh_pages_branch

workflows:
version: 2
Expand All @@ -456,25 +388,16 @@ workflows:
- release_test:
requires:
- release_build
build_and_publish_docs:
jobs:
- docs_build
- docs_publish:
requires:
- docs_build
filters:
branches:
only: master
nightly:
jobs:
- debug_build
- debug_test:
requires:
- debug_build
- release_build
- test_rmw_connext_cpp:
requires:
- release_build
# - test_rmw_connext_cpp:
# requires:
# - release_build
- test_rmw_cyclonedds_cpp:
requires:
- release_build
Expand Down
2 changes: 1 addition & 1 deletion .dockerhub/release/hooks/build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex

export FROM_IMAGE=osrf/ros2:nightly-rmw-nonfree
export FROM_IMAGE=osrf/ros2:nightly
export FAIL_ON_BUILD_FAILURE=""
export UNDERLAY_MIXINS="release ccache"
export OVERLAY_MIXINS="release ccache"
Expand Down
64 changes: 30 additions & 34 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,96 +7,92 @@
# --build-arg UNDERLAY_MIXINS \
# --build-arg OVERLAY_MIXINS ./
ARG FROM_IMAGE=osrf/ros2:nightly
ARG UNDERLAY_WS=/opt/underlay_ws
ARG OVERLAY_WS=/opt/overlay_ws

# multi-stage for caching
FROM $FROM_IMAGE AS cache
FROM $FROM_IMAGE AS cacher

# clone underlay source
ENV UNDERLAY_WS /opt/underlay_ws
RUN mkdir -p $UNDERLAY_WS/src
WORKDIR $UNDERLAY_WS
COPY ./tools/ros2_dependencies.repos ./
RUN vcs import src < ros2_dependencies.repos
ARG UNDERLAY_WS
WORKDIR $UNDERLAY_WS/src
COPY ./tools/ros2_dependencies.repos ../
RUN vcs import ./ < ../ros2_dependencies.repos && \
find ./ -name ".git" | xargs rm -rf

# copy overlay source
ENV OVERLAY_WS /opt/overlay_ws
RUN mkdir -p $OVERLAY_WS/src
WORKDIR $OVERLAY_WS
COPY ./ src/navigation2
ARG OVERLAY_WS
WORKDIR $OVERLAY_WS/src
COPY ./ ./navigation2

# copy manifests for caching
WORKDIR /opt
RUN find ./ -name "package.xml" | \
xargs cp --parents -t /tmp && \
RUN mkdir -p /tmp/opt && \
find ./ -name "package.xml" | \
xargs cp --parents -t /tmp/opt && \
find ./ -name "COLCON_IGNORE" | \
xargs cp --parents -t /tmp
xargs cp --parents -t /tmp/opt || true

# multi-stage for building
FROM $FROM_IMAGE AS build
FROM $FROM_IMAGE AS builder

# install CI dependencies
RUN apt-get update && apt-get install -q -y \
ccache \
lcov \
&& rosdep update \
&& rm -rf /var/lib/apt/lists/*

# copy underlay manifests
ENV UNDERLAY_WS /opt/underlay_ws
COPY --from=cache /tmp/underlay_ws $UNDERLAY_WS
WORKDIR $UNDERLAY_WS

# install underlay dependencies
ARG UNDERLAY_WS
WORKDIR $UNDERLAY_WS
COPY --from=cacher /tmp/$UNDERLAY_WS ./
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
apt-get update && rosdep install -q -y \
--from-paths src \
--ignore-src \
&& rm -rf /var/lib/apt/lists/*

# copy underlay source
COPY --from=cache $UNDERLAY_WS ./

# build underlay source
COPY --from=cacher $UNDERLAY_WS ./
ARG UNDERLAY_MIXINS="release ccache"
ARG FAIL_ON_BUILD_FAILURE=True
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
colcon build \
--symlink-install \
--mixin \
$UNDERLAY_MIXINS \
--mixin $UNDERLAY_MIXINS \
--event-handlers console_direct+ \
|| touch build_failed && \
if [ -f build_failed ] && [ -n "$FAIL_ON_BUILD_FAILURE" ]; then \
exit 1; \
fi

# copy overlay manifests
ENV OVERLAY_WS /opt/overlay_ws
COPY --from=cache /tmp/overlay_ws $OVERLAY_WS
WORKDIR $OVERLAY_WS

# install overlay dependencies
ARG OVERLAY_WS
WORKDIR $OVERLAY_WS
COPY --from=cacher /tmp/$OVERLAY_WS ./
RUN . $UNDERLAY_WS/install/setup.sh && \
apt-get update && rosdep install -q -y \
--from-paths src \
$UNDERLAY_WS/src \
--ignore-src \
&& rm -rf /var/lib/apt/lists/*

# copy overlay source
COPY --from=cache $OVERLAY_WS ./

# build overlay source
COPY --from=cacher $OVERLAY_WS ./
ARG OVERLAY_MIXINS="release ccache"
RUN . $UNDERLAY_WS/install/setup.sh && \
colcon build \
--symlink-install \
--mixin \
$OVERLAY_MIXINS \
--mixin $OVERLAY_MIXINS \
|| touch build_failed && \
if [ -f build_failed ] && [ -n "$FAIL_ON_BUILD_FAILURE" ]; then \
exit 1; \
fi

# source overlay from entrypoint
ENV UNDERLAY_WS $UNDERLAY_WS
ENV OVERLAY_WS $OVERLAY_WS
RUN sed --in-place \
's|^source .*|source "$OVERLAY_WS/install/setup.bash"|' \
/ros_entrypoint.sh
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
[![Build Status](https://img.shields.io/docker/pulls/rosplanning/navigation2.svg?maxAge=2592000)](https://hub.docker.com/r/rosplanning/navigation2) [![Build Status](https://img.shields.io/docker/cloud/build/rosplanning/navigation2.svg?label=docker%20build)](https://hub.docker.com/r/rosplanning/navigation2) [![codecov](https://codecov.io/gh/ros-planning/navigation2/branch/master/graph/badge.svg)](https://codecov.io/gh/ros-planning/navigation2)

For detailed instructions on how to:
- [Getting Started](https://ros-planning.github.io/navigation2/getting_started/index.html)
- [Build](https://ros-planning.github.io/navigation2/build_instructions/index.html#build)
- [Install](https://ros-planning.github.io/navigation2/build_instructions/index.html#install)
- [Tutorials](https://ros-planning.github.io/navigation2/tutorials/index.html)
- [Configure](https://ros-planning.github.io/navigation2/configuration/index.html)
- [Navigation Plugins](https://ros-planning.github.io/navigation2/plugins/index.html)
- [Contribute](https://ros-planning.github.io/navigation2/contribute/index.html)
- [Getting Started](https://navigation.ros.org/getting_started/index.html)
- [Build](https://navigation.ros.org/build_instructions/index.html#build)
- [Install](https://navigation.ros.org/build_instructions/index.html#install)
- [Tutorials](https://navigation.ros.org/tutorials/index.html)
- [Configure](https://navigation.ros.org/configuration/index.html)
- [Navigation Plugins](https://navigation.ros.org/plugins/index.html)
- [Contribute](https://navigation.ros.org/contribute/index.html)

Please visit our [documentation site](https://ros-planning.github.io/navigation2/).
Please visit our [documentation site](https://navigation.ros.org/). [Please visit our community Slack here](https://navigation2.slack.com).

| Service | Dashing | Eloquent | Master |
| :---: | :---: | :---: | :---: |
Expand Down
6 changes: 6 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
fixes:
- "src/navigation2/::"

ignore:
- "*/**/test/*" # ignore package test directories, e.g. nav2_dwb_controller/costmap_queue/tests
- "*/test/**/*" # ignore package test directories, e.g. nav2_costmap_2d/tests
- "**/test_*.*" # ignore files starting with test_ e.g. nav2_map_server/test/test_constants.cpp
- "**/*_tests.*" # ignore files ending with _tests e.g. nav2_voxel_grid/test/voxel_grid_tests.cpp
Loading

0 comments on commit 4e60a95

Please sign in to comment.