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

Fix buildfarm build of rmf_traffic_editor packages #495

Merged
merged 4 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
uses: open-rmf/rmf_ci_templates/.github/workflows/reusable_build.yaml@main
with:
# NOTE: Avoid adding comments in the package lines, this can break some of the called scripts in github actions
# Assets containing no tests caused a build failure in buildfarm, add as a regression test https://github.com/open-rmf/rmf_traffic_editor/pull/495
packages: |
rmf_traffic_editor
rmf_traffic_editor_test_maps
rmf_traffic_editor_assets
rmf_traffic_editor_test_maps
4 changes: 1 addition & 3 deletions rmf_traffic_editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ if (BUILD_TESTING)

find_file(uncrustify_config_file
NAMES "rmf_code_style.cfg"
PATHS
"${rmf_utils_DIR}/../../../share/rmf_utils/"
"/opt/ros/galactic/share/rmf_utils")
PATHS "${rmf_utils_DIR}/../../../share/rmf_utils/")

ament_uncrustify(
ARGN include gui
Expand Down
1 change: 1 addition & 0 deletions rmf_traffic_editor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<build_depend>rmf_utils</build_depend>

<test_depend>ament_cmake_uncrustify</test_depend>
<test_depend>rmf_utils</test_depend>

<depend>libceres-dev</depend>
<depend>libgoogle-glog-dev</depend>
Expand Down
13 changes: 13 additions & 0 deletions rmf_traffic_editor_assets/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
cmake_minimum_required(VERSION 3.5)

project(rmf_traffic_editor_assets LANGUAGES NONE)

find_package(ament_cmake REQUIRED)

ament_package()

install(DIRECTORY
assets/thumbnails
DESTINATION share/${PROJECT_NAME}
)

3 changes: 2 additions & 1 deletion rmf_traffic_editor_assets/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
<maintainer email="[email protected]">Brandon Ong</maintainer>
<maintainer email="[email protected]">Marco A. Gutiérrez</maintainer>
<license>Apache License 2.0</license>
<buildtool_depend>ament_cmake</buildtool_depend>

<export>
<build_type>ament_python</build_type>
<build_type>ament_cmake</build_type>
</export>
</package>
1 change: 0 additions & 1 deletion rmf_traffic_editor_assets/resource/assets

This file was deleted.

Empty file.
43 changes: 0 additions & 43 deletions rmf_traffic_editor_assets/setup.py

This file was deleted.

Loading