From 8cdda26944557827cf7b32ff1006695b071982b9 Mon Sep 17 00:00:00 2001 From: rin4046 Date: Sun, 25 Dec 2022 12:32:46 +0900 Subject: [PATCH 1/8] Include QPainterPath and fix dependencies --- jsk_rviz_plugins/CMakeLists.txt | 23 +++++++++++-------- jsk_rviz_plugins/package.xml | 1 + .../src/overlay_diagnostic_display.hpp | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/jsk_rviz_plugins/CMakeLists.txt b/jsk_rviz_plugins/CMakeLists.txt index 75c67812..7fd026e2 100644 --- a/jsk_rviz_plugins/CMakeLists.txt +++ b/jsk_rviz_plugins/CMakeLists.txt @@ -16,7 +16,8 @@ find_package(ament_cmake REQUIRED) find_package(rviz_common REQUIRED) find_package(rviz_rendering REQUIRED) find_package(rviz_ogre_vendor REQUIRED) -find_package(Qt5 REQUIRED COMPONENTS Widgets Test) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Test REQUIRED) find_package(image_transport REQUIRED) find_package(cv_bridge REQUIRED) @@ -35,6 +36,7 @@ find_package(tf2_ros REQUIRED) find_package(urdf REQUIRED) find_package(visualization_msgs REQUIRED) find_package(diagnostic_msgs REQUIRED) +find_package(actionlib_msgs REQUIRED) find_package(jsk_footstep_msgs REQUIRED) find_package(jsk_gui_msgs REQUIRED) @@ -120,6 +122,7 @@ ament_target_dependencies(jsk_rviz_plugins geometry_msgs nav_msgs diagnostic_msgs + actionlib_msgs jsk_footstep_msgs jsk_gui_msgs jsk_hark_msgs @@ -128,11 +131,11 @@ ament_target_dependencies(jsk_rviz_plugins jsk_topic_tools ) -target_include_directories(jsk_rviz_plugins - PUBLIC - $ - $ - ) +# target_include_directories(jsk_rviz_plugins +# PUBLIC +# $ +# $ +# ) if (NOT WIN32) ament_environment_hooks( @@ -151,10 +154,11 @@ pluginlib_export_plugin_description_file(rviz_common plugins_description.xml) # replaces catkin_package(LIBRARIES jsk_rviz_plugins) ament_export_libraries(jsk_rviz_plugins) -ament_export_include_directories(include) +# ament_export_include_directories(include) ament_export_targets(export_jsk_rviz_plugins HAS_LIBRARY_TARGET) ament_export_dependencies( - Qt5 + Qt5Widgets + Qt5Test rviz_common cv_bridge image_transport @@ -171,6 +175,7 @@ ament_export_dependencies( urdf visualization_msgs diagnostic_msgs + actionlib_msgs jsk_footstep_msgs jsk_gui_msgs jsk_hark_msgs @@ -190,7 +195,7 @@ install(TARGETS ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin - INCLUDES DESTINATION include + # INCLUDES DESTINATION include ) install(DIRECTORY diff --git a/jsk_rviz_plugins/package.xml b/jsk_rviz_plugins/package.xml index 5e279051..eaafe0c2 100644 --- a/jsk_rviz_plugins/package.xml +++ b/jsk_rviz_plugins/package.xml @@ -46,6 +46,7 @@ urdf visualization_msgs diagnostic_msgs + actionlib_msgs jsk_footstep_msgs jsk_gui_msgs jsk_hark_msgs diff --git a/jsk_rviz_plugins/src/overlay_diagnostic_display.hpp b/jsk_rviz_plugins/src/overlay_diagnostic_display.hpp index 51de9fe3..62ab8ddc 100644 --- a/jsk_rviz_plugins/src/overlay_diagnostic_display.hpp +++ b/jsk_rviz_plugins/src/overlay_diagnostic_display.hpp @@ -37,6 +37,7 @@ #include #include +#include #include #include #include From ffc4cddfebaee541298dd7b9dd25567ca74a70be Mon Sep 17 00:00:00 2001 From: rin4046 <72665456+rin4046@users.noreply.github.com> Date: Sun, 25 Dec 2022 17:22:29 +0900 Subject: [PATCH 2/8] Update BuildTest.yaml --- .github/workflows/BuildTest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index d807050c..bff54afb 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - rosdistro : [foxy, galactic] + rosdistro : [foxy, galactic, humble] steps: - uses: actions/checkout@v2-beta - name: Check dependency-${{ matrix.rosdistro }}.repos existence @@ -45,4 +45,4 @@ jobs: uses: OUXT-Polaris/ros2-ci@master if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' with: - ros2-distro: ${{ matrix.rosdistro }} \ No newline at end of file + ros2-distro: ${{ matrix.rosdistro }} From 8d5fabec5977281bf323c6b4db2c8b9da3b8ed6d Mon Sep 17 00:00:00 2001 From: rin4046 Date: Sun, 25 Dec 2022 20:34:14 +0900 Subject: [PATCH 3/8] Revert "Update BuildTest.yaml" This reverts commit ffc4cddfebaee541298dd7b9dd25567ca74a70be. --- .github/workflows/BuildTest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index bff54afb..d807050c 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - rosdistro : [foxy, galactic, humble] + rosdistro : [foxy, galactic] steps: - uses: actions/checkout@v2-beta - name: Check dependency-${{ matrix.rosdistro }}.repos existence @@ -45,4 +45,4 @@ jobs: uses: OUXT-Polaris/ros2-ci@master if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' with: - ros2-distro: ${{ matrix.rosdistro }} + ros2-distro: ${{ matrix.rosdistro }} \ No newline at end of file From 8245db7f8c261e4deef0e3692339aaee8241893b Mon Sep 17 00:00:00 2001 From: rin4046 Date: Sun, 25 Dec 2022 20:40:13 +0900 Subject: [PATCH 4/8] Add job "build_and_test_on_jammy" --- .github/workflows/BuildTest.yaml | 41 +++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index d807050c..296021a9 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -45,4 +45,43 @@ jobs: uses: OUXT-Polaris/ros2-ci@master if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' with: - ros2-distro: ${{ matrix.rosdistro }} \ No newline at end of file + ros2-distro: ${{ matrix.rosdistro }} + + build_and_test_on_jammy: + name: Build + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + rosdistro : [humble] + steps: + - uses: actions/checkout@v2-beta + - name: Check dependency-${{ matrix.rosdistro }}.repos existence + id: check_rosdistro_repos_files + uses: andstor/file-existence-action@v1 + with: + files: dependency-${{ matrix.rosdistro }}.repos + allow_failure: false + - name: Check dependency.repos existence + id: check_repos_files + uses: andstor/file-existence-action@v1 + with: + files: dependency.repos + allow_failure: false + - name: Run OUXT-Polaris/ros2-ci@master with dependency-${{ matrix.rosdistro }}.repos + uses: OUXT-Polaris/ros2-ci@master + if: steps.check_rosdistro_repos_files.outputs.files_exists == 'true' + with: + ros2-distro: ${{ matrix.rosdistro }} + repos-filepath: dependency-${{ matrix.rosdistro }}.repos + - name: Run OUXT-Polaris/ros2-ci@master with dependency.repos + uses: OUXT-Polaris/ros2-ci@master + if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'true' + with: + ros2-distro: ${{ matrix.rosdistro }} + repos-filepath: dependency.repos + - name: Run OUXT-Polaris/ros2-ci@master without repos + uses: OUXT-Polaris/ros2-ci@master + if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' + with: + ros2-distro: ${{ matrix.rosdistro }} From 41b78e00fc0efe8c827aee42272afed942523a4a Mon Sep 17 00:00:00 2001 From: Rin Iwai <72665456+rin4046@users.noreply.github.com> Date: Sat, 4 Feb 2023 01:03:15 +0900 Subject: [PATCH 5/8] Update BuildTest.yaml --- .github/workflows/BuildTest.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index 296021a9..43a6b4ac 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -48,7 +48,7 @@ jobs: ros2-distro: ${{ matrix.rosdistro }} build_and_test_on_jammy: - name: Build + name: Build_jammy runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -85,3 +85,4 @@ jobs: if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' with: ros2-distro: ${{ matrix.rosdistro }} + image-name: osrf/ros:humble-desktop-jammy From d61c854755e13728c9827b285b4b841760285481 Mon Sep 17 00:00:00 2001 From: Rin Iwai <72665456+rin4046@users.noreply.github.com> Date: Sat, 4 Feb 2023 01:10:09 +0900 Subject: [PATCH 6/8] Update BuildTest.yaml --- .github/workflows/BuildTest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index 43a6b4ac..f6672e6b 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -85,4 +85,4 @@ jobs: if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' with: ros2-distro: ${{ matrix.rosdistro }} - image-name: osrf/ros:humble-desktop-jammy + image-name: ros From 23c730a94db519118edfa6b31e4c5b65a03fc425 Mon Sep 17 00:00:00 2001 From: Rin Iwai <72665456+rin4046@users.noreply.github.com> Date: Sat, 4 Feb 2023 01:13:25 +0900 Subject: [PATCH 7/8] Update BuildTest.yaml --- .github/workflows/BuildTest.yaml | 45 +++----------------------------- 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index f6672e6b..996b3192 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -10,11 +10,11 @@ on: jobs: build_and_test: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: - rosdistro : [foxy, galactic] + rosdistro : [foxy, galactic, humble] steps: - uses: actions/checkout@v2-beta - name: Check dependency-${{ matrix.rosdistro }}.repos existence @@ -46,43 +46,4 @@ jobs: if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' with: ros2-distro: ${{ matrix.rosdistro }} - - build_and_test_on_jammy: - name: Build_jammy - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - matrix: - rosdistro : [humble] - steps: - - uses: actions/checkout@v2-beta - - name: Check dependency-${{ matrix.rosdistro }}.repos existence - id: check_rosdistro_repos_files - uses: andstor/file-existence-action@v1 - with: - files: dependency-${{ matrix.rosdistro }}.repos - allow_failure: false - - name: Check dependency.repos existence - id: check_repos_files - uses: andstor/file-existence-action@v1 - with: - files: dependency.repos - allow_failure: false - - name: Run OUXT-Polaris/ros2-ci@master with dependency-${{ matrix.rosdistro }}.repos - uses: OUXT-Polaris/ros2-ci@master - if: steps.check_rosdistro_repos_files.outputs.files_exists == 'true' - with: - ros2-distro: ${{ matrix.rosdistro }} - repos-filepath: dependency-${{ matrix.rosdistro }}.repos - - name: Run OUXT-Polaris/ros2-ci@master with dependency.repos - uses: OUXT-Polaris/ros2-ci@master - if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'true' - with: - ros2-distro: ${{ matrix.rosdistro }} - repos-filepath: dependency.repos - - name: Run OUXT-Polaris/ros2-ci@master without repos - uses: OUXT-Polaris/ros2-ci@master - if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' - with: - ros2-distro: ${{ matrix.rosdistro }} - image-name: ros + image-name: ros # Docker Official Image From 566ea854c75f814bbfa0a5d893e57dfd364fa92a Mon Sep 17 00:00:00 2001 From: Rin Iwai Date: Sat, 4 Feb 2023 01:29:14 +0900 Subject: [PATCH 8/8] Fix dependencies --- jsk_rviz_plugins/CMakeLists.txt | 8 +++----- jsk_rviz_plugins/package.xml | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jsk_rviz_plugins/CMakeLists.txt b/jsk_rviz_plugins/CMakeLists.txt index 7fd026e2..e20cdb20 100644 --- a/jsk_rviz_plugins/CMakeLists.txt +++ b/jsk_rviz_plugins/CMakeLists.txt @@ -16,10 +16,10 @@ find_package(ament_cmake REQUIRED) find_package(rviz_common REQUIRED) find_package(rviz_rendering REQUIRED) find_package(rviz_ogre_vendor REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Test REQUIRED) +find_package(Qt5 REQUIRED COMPONENTS Widgets Test) find_package(image_transport REQUIRED) find_package(cv_bridge REQUIRED) +find_package(Boost REQUIRED) find_package(rclcpp REQUIRED) find_package(std_msgs REQUIRED) @@ -46,7 +46,7 @@ find_package(jsk_rviz_plugin_msgs REQUIRED) find_package(jsk_topic_tools REQUIRED) # for Ogre include files -include_directories(${ADDITIONAL_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}/Paging) +include_directories(${ADDITIONAL_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}/Paging ${Boost_INCLUDE_DIRS}) # Qt5 boilerplate options from http://doc.qt.io/qt-5/cmake-manual.html set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -157,8 +157,6 @@ ament_export_libraries(jsk_rviz_plugins) # ament_export_include_directories(include) ament_export_targets(export_jsk_rviz_plugins HAS_LIBRARY_TARGET) ament_export_dependencies( - Qt5Widgets - Qt5Test rviz_common cv_bridge image_transport diff --git a/jsk_rviz_plugins/package.xml b/jsk_rviz_plugins/package.xml index eaafe0c2..06b94768 100644 --- a/jsk_rviz_plugins/package.xml +++ b/jsk_rviz_plugins/package.xml @@ -19,6 +19,7 @@ qtbase5-dev rviz_ogre_vendor + boost rviz_ogre_vendor libqt5-core