Merge pull request #17 from fmessmer/ci_updates

[travis] ci updates

Author: fmessmer

.travis.rosinstall

@@ -8,16 +8,18 @@ notifications:
     on_failure: always
 env:
   global:
+    - ADDITIONAL_DEBS='apt-utils dialog curl wget'
+    - CATKIN_LINT=pedantic
+    - CATKIN_LINT_ARGS='--ignore description_boilerplate --ignore target_name_collision'
+    - CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release
+    - NOT_TEST_DOWNSTREAM=true
     - ROS_REPO=ros
+    - VERBOSE_OUTPUT=false
+    - VERBOSE_TESTS=false
   matrix:
-    - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file
-    - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian
-    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file
-    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian
-    - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=file
-    - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian
+    - ROS_DISTRO=kinetic
+    - ROS_DISTRO=melodic
 install:
-  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+  - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci -b master
 script:
-  - .ci_config/travis.sh
-#  - ./travis.sh  # Enable this when you have a package-local script
+  - .industrial_ci/travis.sh

.travis.yml

@@ -4,20 +4,20 @@ project(pointcloud_to_laserscan)
 find_package(catkin REQUIRED COMPONENTS
   message_filters
   nodelet
+  pcl_ros
   roscpp
   sensor_msgs
   tf
   tf2
+  tf2_geometry_msgs
   tf2_ros
   tf2_sensor_msgs
-  tf2_geometry_msgs
-  pcl_ros
 )
 
 catkin_package(
   INCLUDE_DIRS include
-  LIBRARIES pointcloud_to_laserscan ipa_pointcloud_to_laserscan roi_outlier_removal
-  CATKIN_DEPENDS roscpp message_filters nodelet sensor_msgs tf2 tf2_ros tf2_sensor_msgs tf2_geometry_msgs pcl_ros
+  LIBRARIES ${PROJECT_NAME} ipa_${PROJECT_NAME} roi_outlier_removal
+  CATKIN_DEPENDS message_filters nodelet pcl_ros roscpp sensor_msgs tf2 tf2_geometry_msgs tf2_ros tf2_sensor_msgs
 )
 
 include_directories(
@@ -34,25 +34,25 @@ target_link_libraries(frame_publisher_node frame_publisher ${catkin_LIBRARIES})
 add_library(roi_outlier_removal src/roi_outlier_removal_nodelet.cpp)
 target_link_libraries(roi_outlier_removal ${catkin_LIBRARIES})
 
-add_library(pointcloud_to_laserscan src/pointcloud_to_laserscan_nodelet.cpp)
-target_link_libraries(pointcloud_to_laserscan ${catkin_LIBRARIES})
+add_library(${PROJECT_NAME} src/${PROJECT_NAME}_nodelet.cpp)
+target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
 
-add_executable(pointcloud_to_laserscan_node src/pointcloud_to_laserscan_node.cpp)
-target_link_libraries(pointcloud_to_laserscan_node pointcloud_to_laserscan ${catkin_LIBRARIES})
+add_executable(${PROJECT_NAME}_node src/${PROJECT_NAME}_node.cpp)
+target_link_libraries(${PROJECT_NAME}_node ${PROJECT_NAME} ${catkin_LIBRARIES})
 
-add_library(ipa_pointcloud_to_laserscan src/ipa_pointcloud_to_laserscan_nodelet.cpp src/scan_outlier_removal_filter.cpp)
-target_link_libraries(ipa_pointcloud_to_laserscan ${catkin_LIBRARIES})
+add_library(ipa_${PROJECT_NAME} src/ipa_${PROJECT_NAME}_nodelet.cpp src/scan_outlier_removal_filter.cpp)
+target_link_libraries(ipa_${PROJECT_NAME} ${catkin_LIBRARIES})
 
-add_executable(ipa_pointcloud_to_laserscan_node src/ipa_pointcloud_to_laserscan_node.cpp src/scan_outlier_removal_filter.cpp)
-target_link_libraries(ipa_pointcloud_to_laserscan_node ipa_pointcloud_to_laserscan ${catkin_LIBRARIES})
+add_executable(ipa_${PROJECT_NAME}_node src/ipa_${PROJECT_NAME}_node.cpp src/scan_outlier_removal_filter.cpp)
+target_link_libraries(ipa_${PROJECT_NAME}_node ipa_${PROJECT_NAME} ${catkin_LIBRARIES})
 
 install(TARGETS frame_publisher
                 frame_publisher_node
+                ipa_${PROJECT_NAME}
+                ipa_${PROJECT_NAME}_node
+                ${PROJECT_NAME}
+                ${PROJECT_NAME}_node
                 roi_outlier_removal
-                pointcloud_to_laserscan
-                pointcloud_to_laserscan_node
-                ipa_pointcloud_to_laserscan
-                ipa_pointcloud_to_laserscan_node
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})