Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release for Noetic #98

Merged
merged 4 commits into from
Jun 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
sudo: required
dist: trusty
services:
- docker
language: generic
Expand All @@ -15,26 +14,19 @@ notifications:
- gm130s@gmail.com
env:
matrix:
- ROS_DISTRO="indigo" ROS_REPO=ros
- ROS_DISTRO="indigo" ROS_REPO=ros-shadow-fixed
- ROS_DISTRO="indigo" PRERELEASE=true
- ROS_DISTRO="kinetic" ROS_REPO=ros ABICHECK_URL='github:ros-drivers/openni2_camera#indigo-devel'
- ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed ABICHECK_URL='github:ros-drivers/openni2_camera#indigo-devel'
- ROS_DISTRO="kinetic" PRERELEASE=true
- ROS_DISTRO="lunar" ROS_REPO=ros
- ROS_DISTRO="lunar" ROS_REPO=ros-shadow-fixed
- ROS_DISTRO="lunar" PRERELEASE=true
- ROS_DISTRO="melodic" ROS_REPO=ros ABICHECK_URL='github:ros-drivers/openni2_camera#indigo-devel' ABICHECK_MERGE=auto
- ROS_DISTRO="melodic" ROS_REPO=ros-shadow-fixed ABICHECK_URL='github:ros-drivers/openni2_camera#indigo-devel' ABICHECK_MERGE=auto
- ROS_DISTRO="melodic" PRERELEASE=true
- ROS_DISTRO="noetic" ROS_REPO=ros ABICHECK_URL='github:ros-drivers/openni2_camera#indigo-devel' ABICHECK_MERGE=auto
- ROS_DISTRO="noetic" PRERELEASE=true
matrix:
allow_failures:
- env: ROS_DISTRO="indigo" PRERELEASE=true
- env: ROS_DISTRO="kinetic" PRERELEASE=true
- env: ROS_DISTRO="lunar" PRERELEASE=true
- env: ROS_DISTRO="melodic" PRERELEASE=true
- env: ROS_DISTRO="noetic" PRERELEASE=true
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
- git clone https://github.com/ros-industrial/industrial_ci.git -b master .ci_config
script:
- source .ci_config/travis.sh
# - source ./travis.sh # Enable this when you have a package-local script
3 changes: 3 additions & 0 deletions openni2_camera/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package openni2_camera
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.2 (2020-06-03)
------------------

0.4.2 (2018-12-01)
------------------

Expand Down
2 changes: 1 addition & 1 deletion openni2_camera/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>openni2_camera</name>
<version>0.4.2</version>
<version>1.4.2</version>
<description>Drivers for the Asus Xtion and Primesense Devices. For using a kinect
with ROS, try the <a href="http://wiki.ros.org/freenect_stack">freenect stack</a>
</description>
Expand Down
5 changes: 5 additions & 0 deletions openni2_launch/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package openni2_launch
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.2 (2020-06-03)
------------------
* update package.xml for noetic support
* Contributors: Michael Ferguson

0.4.2 (2018-12-01)
------------------
* Fix roswtf plugin dependency `#92 <https://github.com/ros-drivers/openni2_camera/issues/92>`_
Expand Down
26 changes: 14 additions & 12 deletions openni2_launch/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<package>
<?xml version="1.0"?>
<package format="3">
<name>openni2_launch</name>
<version>0.4.2</version>
<version>1.4.2</version>
<description>
Launch files to start the openni2_camera drivers using rgbd_launch.
</description>
Expand All @@ -11,17 +12,18 @@
<author email="developers@unboundedrobotics.com">Michael Ferguson</author>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>python-catkin-pkg</build_depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</depend>
<build_depend>roslaunch</build_depend> <!-- For launch check -->
<run_depend>rgbd_launch</run_depend>
<run_depend>depth_image_proc</run_depend>
<run_depend>image_proc</run_depend>
<run_depend>nodelet</run_depend>
<run_depend>openni2_camera</run_depend>
<run_depend>rospy</run_depend>
<run_depend>roswtf</run_depend>
<run_depend>tf</run_depend>
<run_depend>usbutils</run_depend>
<exec_depend>rgbd_launch</exec_depend>
<exec_depend>depth_image_proc</exec_depend>
<exec_depend>image_proc</exec_depend>
<exec_depend>nodelet</exec_depend>
<exec_depend>openni2_camera</exec_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>roswtf</exec_depend>
<exec_depend>tf</exec_depend>
<exec_depend>usbutils</exec_depend>
<export>
<rosdoc config="rosdoc.yaml"/>
<roswtf plugin="openni2_launch.wtf_plugin" />
Expand Down