Skip to content

Commit

Permalink
ignore warning (ros-navigation#3543)
Browse files Browse the repository at this point in the history
* Split overlay setup into multiple steps
by skipping slower to build leaf packages during preparation,
then store cache and repeat setup without skipping packages

* Skip restore steps after already preping overlay
to avoid needlessly downloading the same overlay cache

* Revert resource_class to default medium
as the build resource usage seldom maxes out 4 cores
nor uses more than 2GB RAM

* Fix circleci config syntax
by setting skip default as empty string
to keep it an optional parameter

* Fix circleci config syntax
missing angle brackets

* ignore warning

* Revert "Revert resource_class to default medium"

This reverts commit 44375a1.

* Fix nested defaults
to avoid dropping of cache after storing during test jobs
by ensuring restore_overlay_workspace still sets restore: true

---------

Co-authored-by: ruffsl <[email protected]>
  • Loading branch information
jwallace42 and ruffsl committed Apr 27, 2023
1 parent 131f42e commit dc72467
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
27 changes: 23 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,24 @@ _commands:
type: string
mixins:
type: string
skip:
default: ""
type: string
restore:
default: true
type: boolean
build:
default: true
type: boolean
steps:
- store_artifacts:
path: << parameters.workspace >>/lockfile.txt
- restore_from_cache:
key: << parameters.key >>
workspace: << parameters.workspace >>
- when:
condition: << parameters.restore >>
steps:
- restore_from_cache:
key: << parameters.key >>
workspace: << parameters.workspace >>
- when:
condition: << parameters.build >>
steps:
Expand Down Expand Up @@ -191,6 +200,7 @@ _commands:
. << parameters.underlay >>/install/setup.sh
colcon build \
--packages-select ${BUILD_PACKAGES} \
--packages-skip << parameters.skip >> \
--mixin << parameters.mixins >>
- ccache_stats:
workspace: << parameters.workspace >>
Expand Down Expand Up @@ -370,6 +380,14 @@ _steps:
underlay: /opt/underlay_ws
workspace: /opt/overlay_ws
mixins: ${OVERLAY_MIXINS}
setup_workspace_overlay_1: &setup_workspace_overlay_1
setup_workspace:
<<: *setup_workspace_overlay
skip: nav2_system_tests
setup_workspace_overlay_2: &setup_workspace_overlay_2
setup_workspace:
<<: *setup_workspace_overlay
restore: false
restore_overlay_workspace: &restore_overlay_workspace
setup_workspace:
<<: *setup_workspace_overlay
Expand Down Expand Up @@ -417,7 +435,8 @@ commands:
build_source:
description: "Build Source"
steps:
- *setup_overlay_workspace
- *setup_workspace_overlay_1
- *setup_workspace_overlay_2
restore_build:
description: "Restore Build"
steps:
Expand Down
3 changes: 3 additions & 0 deletions nav2_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ find_package(action_msgs REQUIRED)

nav2_package()

# TODO(jwallace42): This is a work around for https://github.com/ros2/rosidl_typesupport_fastrtps/issues/28
add_compile_options(-Wno-error=deprecated)

rosidl_generate_interfaces(${PROJECT_NAME}
"msg/CollisionMonitorState.msg"
"msg/Costmap.msg"
Expand Down

0 comments on commit dc72467

Please sign in to comment.