diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml new file mode 100644 index 0000000..8da52f4 --- /dev/null +++ b/.github/issue-branch.yml @@ -0,0 +1,9 @@ +branches: + - label: enhancement + prefix: feature/ + - label: bug + prefix: bugfix/ + - label: documentation + prefix: docs/ + - label: maintenance + prefix: maint/ \ No newline at end of file diff --git a/.github/workflows/create_issue_branch.yml b/.github/workflows/create_issue_branch.yml new file mode 100644 index 0000000..c8e6464 --- /dev/null +++ b/.github/workflows/create_issue_branch.yml @@ -0,0 +1,14 @@ +on: + issues: + types: [assigned] + issue_comment: + types: [created] + +jobs: + create_issue_branch_job: + runs-on: ubuntu-latest + steps: + - name: create issue branch + uses: robvanderleek/create-issue-branch@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml new file mode 100644 index 0000000..b039fbc --- /dev/null +++ b/.github/workflows/industrial_ci_action.yml @@ -0,0 +1,29 @@ +# 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: build + +on: [push, pull_request] # on all pushes and PRs + +jobs: + industrial_ci: + strategy: + matrix: + env: + - {ROS_DISTRO: kinetic, ROS_REPO: main, CATKIN_LINT: true} + - {ROS_DISTRO: kinetic, ROS_REPO: main, PRERELEASE: true} + - {ROS_DISTRO: melodic, ROS_REPO: main, CATKIN_LINT: true} + - {ROS_DISTRO: melodic, ROS_REPO: main, PRERELEASE: true} + env: + CCACHE_DIR: /github/home/.ccache # Directory for ccache (and how we enable ccache in industrial_ci) + 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 }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 420af2d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -sudo: required -dist: trusty -language: generic -compiler: - - gcc -cache: - directories: - - $HOME/.ccache # can be any valid cache location -env: - global: - - LIBGL_ALWAYS_SOFTWARE=1 - - VERBOSE_OUTPUT='false' - - CATKIN_CONFIG='--no-install' - - CATKIN_PARALLEL_JOBS='-p1' - - ROS_PARALLEL_JOBS='-j1' - - CCACHE_DIR=$HOME/.ccache - - CATKIN_LINT=true - - CATKIN_LINT_ARGS="--ignore link_directory" -matrix: - include: - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=lunar ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=lunar ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' -install: - - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -script: - - source .ci_config/travis.sh -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/a8c9c6426a721fbb8341 - on_success: change - on_failure: always - on_start: never - slack: uuvsimulator:CeZErwayGqGpYxJaLzCEbjip diff --git a/.uuv_ci_config/install_gazebo9.sh b/.uuv_ci_config/install_gazebo9.sh deleted file mode 100644 index 07badc8..0000000 --- a/.uuv_ci_config/install_gazebo9.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' - -wget http://packages.osrfoundation.org/gazebo.key -O /tmp/gazebo.key - -apt-key add /tmp/gazebo.key - -apt update - -apt -qq install --no-install-recommends --allow-unauthenticated -y gazebo9 libgazebo9-dev ros-kinetic-gazebo9-* - -# source /usr/share/gazebo-9/setup.sh diff --git a/.uuv_ci_config/ros_kinetic.sh b/.uuv_ci_config/ros_kinetic.sh deleted file mode 100644 index ddbb54b..0000000 --- a/.uuv_ci_config/ros_kinetic.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sh .uuv_ci_config/uuv_dependencies.sh diff --git a/.uuv_ci_config/ros_lunar.sh b/.uuv_ci_config/ros_lunar.sh deleted file mode 100644 index a52ae74..0000000 --- a/.uuv_ci_config/ros_lunar.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sh .uuv_ci_config/uuv_dependencies.sh \ No newline at end of file diff --git a/.uuv_ci_config/ros_melodic.sh b/.uuv_ci_config/ros_melodic.sh deleted file mode 100644 index c7b47a5..0000000 --- a/.uuv_ci_config/ros_melodic.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Clone repositories that do not have a ros-lunar package -sh .uuv_ci_config/uuv_dependencies.sh \ No newline at end of file diff --git a/.uuv_ci_config/run_tests.sh b/.uuv_ci_config/run_tests.sh deleted file mode 100644 index 99a6951..0000000 --- a/.uuv_ci_config/run_tests.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cd $CATKIN_WORKSPACE -source devel/setup.bash -catkin run_tests -catkin_test_results - diff --git a/.uuv_ci_config/uuv_dependencies.sh b/.uuv_ci_config/uuv_dependencies.sh deleted file mode 100644 index 286ce93..0000000 --- a/.uuv_ci_config/uuv_dependencies.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# DEP PACKAGES -apt -qq install --no-install-recommends --allow-unauthenticated -y \ - build-essential python-catkin-tools python-pip dvi2ps dvipng binutils \ - mesa-utils module-init-tools x-window-system ros-$ROS_DISTRO-python-orocos-kdl diff --git a/uuv_cpc_sensor/CMakeLists.txt b/uuv_cpc_sensor/CMakeLists.txt index 8690866..beef7b6 100644 --- a/uuv_cpc_sensor/CMakeLists.txt +++ b/uuv_cpc_sensor/CMakeLists.txt @@ -7,7 +7,7 @@ add_compile_options(-std=c++11) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages -find_package(catkin REQUIRED +find_package(catkin REQUIRED COMPONENTS std_msgs nav_msgs sensor_msgs @@ -23,6 +23,7 @@ catkin_package( INCLUDE_DIRS include LIBRARIES uuv_cpc_ros_sensor CATKIN_DEPENDS + roscpp sensor_msgs std_msgs nav_msgs diff --git a/uuv_cpc_sensor/package.xml b/uuv_cpc_sensor/package.xml index 669f169..3575ac6 100644 --- a/uuv_cpc_sensor/package.xml +++ b/uuv_cpc_sensor/package.xml @@ -9,10 +9,9 @@ Apache-2.0 - roscpp - geographiclib - tf2_ros - + roscpp + geographiclib + tf2_ros sensor_msgs std_msgs nav_msgs