Merge pull request #39 from OctoMap/wxm-upgrade-to-noetic

Add GitHub Actions CI, address warnings for ROS Noetic

Author: wxmerkt

.github/workflows/industrial_ci_action.yml

@@ -0,0 +1,32 @@
+# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
+# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
+
+name: CI
+
+# This determines when this workflow is run
+on: [push, pull_request] # on all pushes and PRs
+
+jobs:
+  CI:
+    strategy:
+      matrix:
+        env:
+          - {ROS_DISTRO: kinetic}
+          - {ROS_DISTRO: melodic}
+          - {ROS_DISTRO: noetic}
+          - {ROS_DISTRO: kinetic, PRERELEASE: true}
+          - {ROS_DISTRO: melodic, PRERELEASE: true}
+          - {ROS_DISTRO: noetic, PRERELEASE: true}
+    env:
+      CCACHE_DIR: /github/home/.ccache # Enable ccache
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      # This step will fetch/store the directory used by ccache before/after the ci run
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
+      # Run industrial_ci
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{ matrix.env }}

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(octomap_rviz_plugins)
 
 find_package(catkin REQUIRED COMPONENTS octomap_msgs
@@ -21,7 +21,7 @@ catkin_package(
     CATKIN_DEPENDS octomap_msgs
                    roscpp
                    rviz
-    DEPENDS octomap
+    DEPENDS OCTOMAP
 )
 
 
@@ -49,6 +49,7 @@ set(SOURCE_FILES
 
 add_library(${PROJECT_NAME} ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${Boost_LIBRARIES} ${OCTOMAP_LIBRARIES} ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME} PUBLIC "-Wno-register") # Avoid OGRE deprecaton warnings under C++17
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}

README.md

@@ -1,4 +1,4 @@
-octomap_rviz_plugins
+octomap_rviz_plugins [![CI](https://github.com/octomap/octomap_rviz_plugins/workflows/CI/badge.svg)](https://github.com/octomap/octomap_rviz_plugins/actions?query=workflow%3ACI)
 ====================
 
 RViz display plugins for visualizing octomap messages (ROS groovy and later):

package.xml

@@ -1,13 +1,13 @@
-<package>
+<package format="3">
   <name>octomap_rviz_plugins</name>
   <version>0.2.2</version>
-    <description>
+  <description>
      A set of plugins for displaying occupancy information decoded from binary octomap messages. 
-    </description>
+  </description>
 
   <maintainer email="armin@hornung.io">Armin Hornung</maintainer>
-  <maintainer email="w.merkt+oss@gmail.com">Wolfgang Merkt</maintainer>
-  
+  <maintainer email="opensource@wolfgangmerkt.com">Wolfgang Merkt</maintainer>
+
   <url type="website">http://ros.org/wiki/octomap_rviz_plugins</url>
   <url type="bugtracker">https://github.com/OctoMap/octomap_rviz_plugins/issues</url>
 
@@ -24,17 +24,16 @@
   <build_depend>qtbase5-dev</build_depend>
   <build_depend>libqt5-core</build_depend>
   <build_depend>libqt5-widgets</build_depend>
- 
-  <run_depend>octomap_msgs</run_depend>
-  <run_depend>octomap</run_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>rviz</run_depend>
-  <run_depend>qtbase5-dev</run_depend>
-  <run_depend>libqt5-core</run_depend>
-  <run_depend>libqt5-widgets</run_depend>
+
+  <exec_depend>octomap_msgs</exec_depend>
+  <exec_depend>octomap</exec_depend>
+  <exec_depend>roscpp</exec_depend>
+  <exec_depend>rviz</exec_depend>
+  <exec_depend>qtbase5-dev</exec_depend>
+  <exec_depend>libqt5-core</exec_depend>
+  <exec_depend>libqt5-widgets</exec_depend>
 
   <export>
     <rviz plugin="${prefix}/plugin_description.xml"/>
   </export>
-
 </package>