From d69d0b18bf1d3644aaf852b3b128045959e762a3 Mon Sep 17 00:00:00 2001 From: Richard Bormann Date: Mon, 31 Jul 2017 10:35:27 +0200 Subject: [PATCH 1/3] Travis extensions --- .travis.rosinstall.jade | 1 - .travis.yml | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) delete mode 120000 .travis.rosinstall.jade diff --git a/.travis.rosinstall.jade b/.travis.rosinstall.jade deleted file mode 120000 index 88265f9..0000000 --- a/.travis.rosinstall.jade +++ /dev/null @@ -1 +0,0 @@ -.travis.rosinstall.kinetic \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index e06eacf..c8316a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,16 @@ notifications: on_failure: always env: global: - - UPSTREAM_WORKSPACE=file + - ROS_REPO=ros - ROS_PARALLEL_JOBS=-j4 matrix: - - ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu -matrix: + - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file + - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debianmatrix: allow_failures: - - env: ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - env: ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu + - env: ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian + - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config script: From d880784498649bfb44169716997873d6e72daa8b Mon Sep 17 00:00:00 2001 From: Richard Bormann Date: Mon, 31 Jul 2017 12:32:07 +0200 Subject: [PATCH 2/3] deactivated cob_object_categorization so that kinectic can compile --- cob_object_categorization/CATKIN_IGNORE | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 cob_object_categorization/CATKIN_IGNORE diff --git a/cob_object_categorization/CATKIN_IGNORE b/cob_object_categorization/CATKIN_IGNORE new file mode 100644 index 0000000..e69de29 From 29d38e9d7c7e7810868645c9e2f0340fe9ddf704 Mon Sep 17 00:00:00 2001 From: Richard Bormann Date: Mon, 31 Jul 2017 14:36:39 +0200 Subject: [PATCH 3/3] fixed a typo --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c8316a4..e868a3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,8 @@ env: - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file - - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debianmatrix: + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian +matrix: allow_failures: - env: ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian