From b6a6359f7695ed5ba9998c5996e04e3b58b36219 Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Wed, 25 Sep 2024 15:51:57 +0800 Subject: [PATCH 1/3] Add environment hooks for plugins path (#136) Signed-off-by: Luca Della Vedova --- rmf_building_sim_gz_plugins/CMakeLists.txt | 2 ++ .../hooks/rmf_building_sim_gz_plugins.dsv.in | 2 ++ rmf_robot_sim_gz_plugins/CMakeLists.txt | 2 ++ rmf_robot_sim_gz_plugins/hooks/rmf_robot_sim_gz_plugins.dsv.in | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 rmf_building_sim_gz_plugins/hooks/rmf_building_sim_gz_plugins.dsv.in create mode 100644 rmf_robot_sim_gz_plugins/hooks/rmf_robot_sim_gz_plugins.dsv.in diff --git a/rmf_building_sim_gz_plugins/CMakeLists.txt b/rmf_building_sim_gz_plugins/CMakeLists.txt index ab1bdbb..cf3c53a 100644 --- a/rmf_building_sim_gz_plugins/CMakeLists.txt +++ b/rmf_building_sim_gz_plugins/CMakeLists.txt @@ -46,6 +46,8 @@ find_package(Qt5 ) find_package(menge_vendor REQUIRED) +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/${PROJECT_NAME}.dsv.in") + include(GNUInstallDirs) ############################### diff --git a/rmf_building_sim_gz_plugins/hooks/rmf_building_sim_gz_plugins.dsv.in b/rmf_building_sim_gz_plugins/hooks/rmf_building_sim_gz_plugins.dsv.in new file mode 100644 index 0000000..2efcbf5 --- /dev/null +++ b/rmf_building_sim_gz_plugins/hooks/rmf_building_sim_gz_plugins.dsv.in @@ -0,0 +1,2 @@ +prepend-non-duplicate;GZ_SIM_SYSTEM_PLUGIN_PATH;lib/rmf_building_sim_gz_plugins/ +prepend-non-duplicate;GZ_GUI_PLUGIN_PATH;lib/rmf_building_sim_gz_plugins/ diff --git a/rmf_robot_sim_gz_plugins/CMakeLists.txt b/rmf_robot_sim_gz_plugins/CMakeLists.txt index 5bff7aa..01331b9 100644 --- a/rmf_robot_sim_gz_plugins/CMakeLists.txt +++ b/rmf_robot_sim_gz_plugins/CMakeLists.txt @@ -48,6 +48,8 @@ find_package (Qt5 REQUIRED ) +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/${PROJECT_NAME}.dsv.in") + include(GNUInstallDirs) ############################### diff --git a/rmf_robot_sim_gz_plugins/hooks/rmf_robot_sim_gz_plugins.dsv.in b/rmf_robot_sim_gz_plugins/hooks/rmf_robot_sim_gz_plugins.dsv.in new file mode 100644 index 0000000..0c51ea1 --- /dev/null +++ b/rmf_robot_sim_gz_plugins/hooks/rmf_robot_sim_gz_plugins.dsv.in @@ -0,0 +1,2 @@ +prepend-non-duplicate;GZ_SIM_SYSTEM_PLUGIN_PATH;lib/rmf_robot_sim_gz_plugins/ +prepend-non-duplicate;GZ_GUI_PLUGIN_PATH;lib/rmf_robot_sim_gz_plugins/ From b47f572757c45d81ad2789ed583d1675f7f41ee4 Mon Sep 17 00:00:00 2001 From: Xiyu Oh Date: Tue, 20 May 2025 05:14:10 +0000 Subject: [PATCH 2/3] Build CI against jazzy Signed-off-by: Xiyu Oh --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c23d31c..8d3af9d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,4 +15,4 @@ jobs: rmf_building_sim_gz_plugins rmf_robot_sim_common rmf_robot_sim_gz_plugins - dist-matrix: '[{"ros_distribution": "rolling", "ubuntu_distribution": "noble"}]' + dist-matrix: '[{"ros_distribution": "jazzy", "ubuntu_distribution": "noble"}]' From 1d1583433e4e62462f5594a58eea5415b08935f2 Mon Sep 17 00:00:00 2001 From: Xiyu Oh Date: Tue, 20 May 2025 05:26:09 +0000 Subject: [PATCH 3/3] Missed out asan and tsan Signed-off-by: Xiyu Oh --- .github/workflows/asan.yaml | 2 +- .github/workflows/tsan.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml index 9039a51..eba8b50 100644 --- a/.github/workflows/asan.yaml +++ b/.github/workflows/asan.yaml @@ -15,4 +15,4 @@ jobs: rmf_building_sim_gz_plugins rmf_robot_sim_common rmf_robot_sim_gz_plugins - dist-matrix: '[{"ros_distribution": "rolling", "ubuntu_distribution": "noble"}]' + dist-matrix: '[{"ros_distribution": "jazzy", "ubuntu_distribution": "noble"}]' diff --git a/.github/workflows/tsan.yaml b/.github/workflows/tsan.yaml index 181f086..caadecc 100644 --- a/.github/workflows/tsan.yaml +++ b/.github/workflows/tsan.yaml @@ -15,5 +15,5 @@ jobs: rmf_robot_sim_common rmf_robot_sim_gz_plugins # Foxy and Galactic are deprecated for this package because of the dependency to old gazebo packages - dist-matrix: '[{"ros_distribution": "rolling", "ubuntu_distribution": "noble"}]' + dist-matrix: '[{"ros_distribution": "jazzy", "ubuntu_distribution": "noble"}]' mixin: tsan