Fix buildfarm build of rmf_traffic_editor packages (#495)

Signed-off-by: Luca Della Vedova <[email protected]>
open-rmf · May 29, 2024 · 19784b0 · 19784b0
1 parent 0074e3d
commit 19784b0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 49 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -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
diff --git a/rmf_traffic_editor/CMakeLists.txt b/rmf_traffic_editor/CMakeLists.txt
@@ -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

diff --git a/rmf_traffic_editor/package.xml b/rmf_traffic_editor/package.xml
@@ -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>

diff --git a/rmf_traffic_editor_assets/CMakeLists.txt b/rmf_traffic_editor_assets/CMakeLists.txt
@@ -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}
+)
+
diff --git a/rmf_traffic_editor_assets/package.xml b/rmf_traffic_editor_assets/package.xml
@@ -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>
diff --git a/rmf_traffic_editor_assets/resource/assets b/rmf_traffic_editor_assets/resource/assets
diff --git a/rmf_traffic_editor_assets/resource/rmf_traffic_editor_assets b/rmf_traffic_editor_assets/resource/rmf_traffic_editor_assets
diff --git a/rmf_traffic_editor_assets/setup.py b/rmf_traffic_editor_assets/setup.py