diff --git a/.travis.yml b/.travis.yml
index 42294863b0b9e77feefca69de0822bfe5cccb227..0acaeb87102e591112a8025595019dc98e3084e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,21 @@
# https://github.com/ros-infrastructure/ros_buildfarm/blob/master/doc/jobs/prerelease_jobs.rst
# while this doesn't require sudo we don't want to run within a Docker container
sudo: true
-dist: trusty
+dist: bionic
language: python
-python:
- - "3.4"
env:
global:
- JOB_PATH=/tmp/devel_job
- ABORT_ON_TEST_FAILURE=1
matrix:
- - ROS_DISTRO_NAME=indigo OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
- - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
- - ROS_DISTRO_NAME=lunar OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
+ # - ROS_DISTRO_NAME=indigo OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
+ # - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
+ # - ROS_DISTRO_NAME=lunar OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
- ROS_DISTRO_NAME=melodic OS_NAME=ubuntu OS_CODE_NAME=bionic ARCH=amd64
-matrix:
- allow_failures:
- - env: ROS_DISTRO_NAME=melodic OS_NAME=ubuntu OS_CODE_NAME=bionic ARCH=amd64
+ - ROS_DISTRO_NAME=noetic OS_NAME=ubuntu OS_CODE_NAME=focal ARCH=amd64
+# matrix:
+# allow_failures:
+# - env: ROS_DISTRO_NAME=melodic OS_NAME=ubuntu OS_CODE_NAME=bionic ARCH=amd64
install:
# either install the latest released version of ros_buildfarm
- pip install ros_buildfarm
@@ -29,14 +28,14 @@ install:
# run devel job for a ROS repository with the same name as this repo
- export REPOSITORY_NAME=`basename $TRAVIS_BUILD_DIR`
# use the code already checked out by Travis
- - mkdir -p $JOB_PATH/catkin_workspace/src
- - cp -R $TRAVIS_BUILD_DIR $JOB_PATH/catkin_workspace/src/
+ - mkdir -p $JOB_PATH/ws/src
+ - cp -R $TRAVIS_BUILD_DIR $JOB_PATH/ws/src/
# generate the script to run a pre-release job for that target and repo
- generate_prerelease_script.py https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH --output-dir $JOB_PATH
# run the actual job which involves Docker
- cd $JOB_PATH; sh ./prerelease.sh -y
script:
# get summary of test results
- - /tmp/catkin/bin/catkin_test_results $JOB_PATH/catkin_workspace/test_results --all
+ - /tmp/catkin/bin/catkin_test_results $JOB_PATH/ws/test_results --all
notifications:
email: false
diff --git a/libuvc_camera/package.xml b/libuvc_camera/package.xml
index d9dae65e45eb271afa3f152e6bf63c5601680724..4234b662ff511d2b363e672c68c01515d5127f1b 100644
--- a/libuvc_camera/package.xml
+++ b/libuvc_camera/package.xml
@@ -1,70 +1,28 @@
<?xml version="1.0"?>
-<package>
+<package format="3">
<name>libuvc_camera</name>
<version>0.0.10</version>
<description>USB Video Class camera driver</description>
- <!-- One maintainer tag required, multiple allowed, one person per tag -->
- <!-- Example: -->
- <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="ken@tossell.net">Ken Tossell</maintainer>
<maintainer email="ros-orphaned-packages@googlegroups.com">ROS Orphaned Package Maintainers</maintainer>
-
- <!-- One license tag required, multiple allowed, one license per tag -->
- <!-- Commonly used license strings: -->
- <!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<license>BSD</license>
-
- <!-- Url tags are optional, but mutiple are allowed, one per tag -->
- <!-- Optional attribute type can be: website, bugtracker, or repository -->
- <!-- Example: -->
<url type="website">http://ros.org/wiki/libuvc_camera</url>
-
- <!-- Author tags are optional, mutiple are allowed, one per tag -->
- <!-- Authors do not have to be maintianers, but could be -->
- <!-- Example: -->
- <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
-
-
- <!-- The *_depend tags are used to specify dependencies -->
- <!-- Dependencies can be catkin packages or system dependencies -->
- <!-- Examples: -->
- <!-- Use build_depend for packages you need at compile time: -->
- <!-- <build_depend>message_generation</build_depend> -->
- <build_depend>roscpp</build_depend>
- <build_depend>camera_info_manager</build_depend>
- <build_depend>dynamic_reconfigure</build_depend>
- <build_depend>image_transport</build_depend>
- <build_depend>libuvc</build_depend>
- <build_depend>nodelet</build_depend>
- <build_depend>sensor_msgs</build_depend>
- <!-- Use buildtool_depend for build tool packages: -->
- <!-- <buildtool_depend>catkin</buildtool_depend> -->
<buildtool_depend>catkin</buildtool_depend>
- <!-- Use run_depend for packages you need at runtime: -->
- <!-- <run_depend>message_runtime</run_depend> -->
- <run_depend>roscpp</run_depend>
- <run_depend>camera_info_manager</run_depend>
- <run_depend>dynamic_reconfigure</run_depend>
- <run_depend>image_transport</run_depend>
- <run_depend>libuvc</run_depend>
- <run_depend>nodelet</run_depend>
- <run_depend>sensor_msgs</run_depend>
- <!-- Use test_depend for packages you need only for testing: -->
- <!-- <test_depend>gtest</test_depend> -->
-
+ <depend>roscpp</depend>
+ <depend>camera_info_manager</depend>
+ <depend>dynamic_reconfigure</depend>
+ <depend>image_transport</depend>
+ <depend condition="$ROS_DISTRO != noetic">libuvc</depend>
+ <depend condition="$ROS_DISTRO == noetic">libuvc-dev</depend>
+ <depend>nodelet</depend>
+ <depend>sensor_msgs</depend>
- <!-- The export tag contains other, unspecified, tags -->
<export>
- <!-- You can specify that this package is a metapackage here: -->
- <!-- <metapackage/> -->
-
- <!-- Other tools can request additional information be placed here -->
<nodelet plugin="${prefix}/libuvc_camera_nodelet.xml" />
-
</export>
</package>