diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a954db6d..501088e04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -261,6 +261,44 @@ jobs: - name: Show statistics for ccache uses: ./.github/actions/log-ccache-stats + install: + name: Catkin install + needs: [ workspace-container, build ] + runs-on: [ self-hosted, vwire ] + container: + image: ${{ needs.workspace-container.outputs.image }} + steps: + - name: Fetch the package's repository + uses: actions/checkout@v3 + # NOTE: Even though the repo is already present in the container, we + # also need to check it out at GitHub Actions' preferred location + # for private actions and problem matchers to work. + + - name: Setup ccache + uses: ./.github/actions/setup-ccache + with: + cache-group: noetic-gcc-release + cache-version: ${{ secrets.CCACHE_CACHE_VERSION }} + + - name: Enable catkin install + working-directory: ${{ env.CATKIN_WS_PATH }} + shell: bash + run: | + catkin config --install + catkin clean -b -y + + - name: Build all wavemap packages + working-directory: ${{ env.CATKIN_WS_PATH }} + shell: bash + run: | + . /opt/ros/noetic/setup.sh + echo "::add-matcher::./.github/problem-matchers/gcc.json" + catkin build wavemap_all --no-status --force-color + echo "::remove-matcher owner=problem-matcher-gcc::" + + - name: Show statistics for ccache + uses: ./.github/actions/log-ccache-stats + clang-tidy: name: Clang tidy needs: [ workspace-container, build ] diff --git a/libraries/wavemap/CHANGELOG.rst b/libraries/wavemap/CHANGELOG.rst index b897b7c98..60f979cf1 100644 --- a/libraries/wavemap/CHANGELOG.rst +++ b/libraries/wavemap/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package wavemap ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ +* Add missing install rules for wavemap +* Contributors: Alexander Stumpf + 1.5.1 (2023-09-08) ------------------ diff --git a/libraries/wavemap/CMakeLists.txt b/libraries/wavemap/CMakeLists.txt index 99cce19dc..c6d86dc81 100644 --- a/libraries/wavemap/CMakeLists.txt +++ b/libraries/wavemap/CMakeLists.txt @@ -71,6 +71,19 @@ add_library(${PROJECT_NAME} src/utils/thread_pool.cc) target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) +# Install targets +install(TARGETS ${PROJECT_NAME} + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) + +# Mark cpp header files for installation +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h" +) + # Tests if (CATKIN_ENABLE_TESTING) catkin_add_gtest( diff --git a/libraries/wavemap/package.xml b/libraries/wavemap/package.xml index 0ee8f2a56..10b638065 100644 --- a/libraries/wavemap/package.xml +++ b/libraries/wavemap/package.xml @@ -1,7 +1,7 @@ wavemap - 1.5.1 + 1.5.2 Base library for wavemap. Victor Reijgwart diff --git a/libraries/wavemap_io/CHANGELOG.rst b/libraries/wavemap_io/CHANGELOG.rst index 33679501a..75de7b6e5 100644 --- a/libraries/wavemap_io/CHANGELOG.rst +++ b/libraries/wavemap_io/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_io ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ diff --git a/libraries/wavemap_io/package.xml b/libraries/wavemap_io/package.xml index c7b00326f..e892d6782 100644 --- a/libraries/wavemap_io/package.xml +++ b/libraries/wavemap_io/package.xml @@ -1,7 +1,7 @@ wavemap_io - 1.5.1 + 1.5.2 (De)serialization of wavemap types to files. Victor Reijgwart diff --git a/ros/wavemap_msgs/CHANGELOG.rst b/ros/wavemap_msgs/CHANGELOG.rst index b4eb18a18..08b5d76be 100644 --- a/ros/wavemap_msgs/CHANGELOG.rst +++ b/ros/wavemap_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ diff --git a/ros/wavemap_msgs/package.xml b/ros/wavemap_msgs/package.xml index 430da0cd4..34c1cd58d 100644 --- a/ros/wavemap_msgs/package.xml +++ b/ros/wavemap_msgs/package.xml @@ -1,7 +1,7 @@ wavemap_msgs - 1.5.1 + 1.5.2 Message definitions for wavemap's ROS interfaces. Victor Reijgwart diff --git a/ros/wavemap_ros/CHANGELOG.rst b/ros/wavemap_ros/CHANGELOG.rst index 12c0c5b3c..dd8095c47 100644 --- a/ros/wavemap_ros/CHANGELOG.rst +++ b/ros/wavemap_ros/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package wavemap_ros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ +* Add missing install rules for wavemap +* Contributors: Alexander Stumpf + 1.5.1 (2023-09-08) ------------------ diff --git a/ros/wavemap_ros/CMakeLists.txt b/ros/wavemap_ros/CMakeLists.txt index 6d88ed49b..2002ae718 100644 --- a/ros/wavemap_ros/CMakeLists.txt +++ b/ros/wavemap_ros/CMakeLists.txt @@ -40,3 +40,8 @@ target_link_libraries(wavemap_rosbag_processor ${PROJECT_NAME}) # Export cs_install() cs_export() + +# Export config files +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/config/ + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config +) diff --git a/ros/wavemap_ros/package.xml b/ros/wavemap_ros/package.xml index 33761425b..303b14f4f 100644 --- a/ros/wavemap_ros/package.xml +++ b/ros/wavemap_ros/package.xml @@ -1,7 +1,7 @@ wavemap_ros - 1.5.1 + 1.5.2 ROS interface for wavemap. Victor Reijgwart diff --git a/ros/wavemap_ros_conversions/CHANGELOG.rst b/ros/wavemap_ros_conversions/CHANGELOG.rst index 25da153de..5a774843f 100644 --- a/ros/wavemap_ros_conversions/CHANGELOG.rst +++ b/ros/wavemap_ros_conversions/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_ros_conversions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ diff --git a/ros/wavemap_ros_conversions/package.xml b/ros/wavemap_ros_conversions/package.xml index 317e767a7..e0ab3b168 100644 --- a/ros/wavemap_ros_conversions/package.xml +++ b/ros/wavemap_ros_conversions/package.xml @@ -1,7 +1,7 @@ wavemap_ros_conversions - 1.5.1 + 1.5.2 Conversions between wavemap and ROS types. Victor Reijgwart diff --git a/ros/wavemap_rviz_plugin/CHANGELOG.rst b/ros/wavemap_rviz_plugin/CHANGELOG.rst index 173790376..38220a6b0 100644 --- a/ros/wavemap_rviz_plugin/CHANGELOG.rst +++ b/ros/wavemap_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ diff --git a/ros/wavemap_rviz_plugin/package.xml b/ros/wavemap_rviz_plugin/package.xml index 8a7bdf2ac..6f1598bbe 100644 --- a/ros/wavemap_rviz_plugin/package.xml +++ b/ros/wavemap_rviz_plugin/package.xml @@ -1,7 +1,7 @@ wavemap_rviz_plugin - 1.5.1 + 1.5.2 Plugin to interactively visualize maps published in wavemap's native format. diff --git a/tooling/packages/catkin_setup/CHANGELOG.rst b/tooling/packages/catkin_setup/CHANGELOG.rst index 43e8cc8cd..f416f4469 100644 --- a/tooling/packages/catkin_setup/CHANGELOG.rst +++ b/tooling/packages/catkin_setup/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package catkin_setup ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ diff --git a/tooling/packages/catkin_setup/package.xml b/tooling/packages/catkin_setup/package.xml index 1d1fb18a3..dc784cca1 100644 --- a/tooling/packages/catkin_setup/package.xml +++ b/tooling/packages/catkin_setup/package.xml @@ -1,7 +1,7 @@ catkin_setup - 1.5.1 + 1.5.2 Dummy package to make it easy to setup the workspace and generate the setup.[sh|bash|zsh] scripts in CI. Victor Reijgwart diff --git a/tooling/packages/wavemap_all/CHANGELOG.rst b/tooling/packages/wavemap_all/CHANGELOG.rst index 3806b2446..2dfc17b4c 100644 --- a/tooling/packages/wavemap_all/CHANGELOG.rst +++ b/tooling/packages/wavemap_all/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_all ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ diff --git a/tooling/packages/wavemap_all/package.xml b/tooling/packages/wavemap_all/package.xml index 64b750fa1..817700c33 100644 --- a/tooling/packages/wavemap_all/package.xml +++ b/tooling/packages/wavemap_all/package.xml @@ -1,7 +1,7 @@ wavemap_all - 1.5.1 + 1.5.2 Metapackage that builds all wavemap packages. Victor Reijgwart diff --git a/tooling/packages/wavemap_utils/CHANGELOG.rst b/tooling/packages/wavemap_utils/CHANGELOG.rst index ed657a39b..c63f823c7 100644 --- a/tooling/packages/wavemap_utils/CHANGELOG.rst +++ b/tooling/packages/wavemap_utils/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package wavemap_utils ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.5.2 (2023-09-19) +------------------ + 1.5.1 (2023-09-08) ------------------ * Show documentation preview without using Python HTTP server diff --git a/tooling/packages/wavemap_utils/package.xml b/tooling/packages/wavemap_utils/package.xml index 218d0524d..47a04f934 100644 --- a/tooling/packages/wavemap_utils/package.xml +++ b/tooling/packages/wavemap_utils/package.xml @@ -1,7 +1,7 @@ wavemap_utils - 1.5.1 + 1.5.2 Small package containing scripts to simplify common wavemap development tasks. Victor Reijgwart