From b00e6d80ffefd2475e5a62ad351fdd7b2af7fb26 Mon Sep 17 00:00:00 2001 From: fmessmer Date: Wed, 7 Aug 2019 15:11:51 +0200 Subject: [PATCH] update travis.yml --- .travis.rosinstall.kinetic | 8 ++++---- .travis.rosinstall.melodic | 20 ++++---------------- .travis.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic index bc84fcf6..98b31aa4 100644 --- a/.travis.rosinstall.kinetic +++ b/.travis.rosinstall.kinetic @@ -13,7 +13,7 @@ - git: uri: 'https://github.com/ipa320/cob_common.git' local-name: cob_common - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_control.git' local-name: cob_control @@ -21,7 +21,7 @@ - git: uri: 'https://github.com/ipa320/cob_driver.git' local-name: cob_driver - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_environments.git' local-name: cob_environments @@ -53,11 +53,11 @@ - git: uri: 'https://github.com/ipa320/cob_robots.git' local-name: cob_robots - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_simulation.git' local-name: cob_simulation - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_substitute.git' local-name: cob_substitute diff --git a/.travis.rosinstall.melodic b/.travis.rosinstall.melodic index bc84fcf6..6563f994 100644 --- a/.travis.rosinstall.melodic +++ b/.travis.rosinstall.melodic @@ -13,7 +13,7 @@ - git: uri: 'https://github.com/ipa320/cob_common.git' local-name: cob_common - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_control.git' local-name: cob_control @@ -21,7 +21,7 @@ - git: uri: 'https://github.com/ipa320/cob_driver.git' local-name: cob_driver - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_environments.git' local-name: cob_environments @@ -53,11 +53,11 @@ - git: uri: 'https://github.com/ipa320/cob_robots.git' local-name: cob_robots - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_simulation.git' local-name: cob_simulation - version: indigo_dev + version: kinetic_dev - git: uri: 'https://github.com/ipa320/cob_substitute.git' local-name: cob_substitute @@ -66,20 +66,8 @@ uri: 'https://github.com/ipa320/cob_supported_robots.git' local-name: cob_supported_robots version: indigo_dev -- git: - uri: 'https://github.com/ipa320/schunk_modular_robotics.git' - local-name: schunk_modular_robotics - version: indigo_dev - git: uri: 'https://github.com/ipa320/realsense.git' local-name: realsense version: indigo-devel -- git: - uri: 'https://github.com/SICKAG/sick_visionary_t.git' - local-name: sick_visionary_t - version: indigo-devel -- git: - uri: 'https://github.com/ros-industrial/universal_robot.git' - local-name: universal_robot - version: kinetic-devel diff --git a/.travis.yml b/.travis.yml index 12aa0ddf..0689dd18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ -sudo: required -dist: trusty language: generic +services: + - docker + notifications: email: on_success: change @@ -14,12 +15,11 @@ env: - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian - - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=file CATKIN_PARALLEL_JOBS='--continue-on-failure' - - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian CATKIN_PARALLEL_JOBS='--continue-on-failure' + - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=file + - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian matrix: allow_failures: - - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=file CATKIN_PARALLEL_JOBS='--continue-on-failure' - - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian CATKIN_PARALLEL_JOBS='--continue-on-failure' + - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config script: