update travis.yml

ipa320 · Aug 7, 2019 · b00e6d8 · b00e6d8
1 parent c3ae987
commit b00e6d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic
@@ -13,15 +13,15 @@
 - 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
     version: kinetic_dev
 - 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
@@ -13,15 +13,15 @@
 - 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
     version: kinetic_dev
 - 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
@@ -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: