Merge pull request #4 from tork-a/release_to_melodic

- Add melodic entries for travis.yml - remove and rename files which is not supported by current Melodic release
tork-a · Dec 18, 2019 · cd7b1aa · cd7b1aa
2 parents 4cbe1c0 + b06b132
commit cd7b1aa
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,9 +11,12 @@ env:
   matrix:
     - USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
     - USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
+    - USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
+    - USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
 matrix:
   allow_failures:
     - env: USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
+    - env: USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu      
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script: 

diff --git a/fake_joint_launch/launch/nextage.launch → ...oint_launch/launch/nextage.launch.kinetic b/fake_joint_launch/launch/nextage.launch → ...oint_launch/launch/nextage.launch.kinetic
diff --git a/fake_joint_launch/launch/tra1.launch → fake_joint_launch/launch/tra1.launch.kinetic b/fake_joint_launch/launch/tra1.launch → fake_joint_launch/launch/tra1.launch.kinetic
diff --git a/fake_joint_launch/launch/ur3.launch → fake_joint_launch/launch/ur3.launch.kinetic b/fake_joint_launch/launch/ur3.launch → fake_joint_launch/launch/ur3.launch.kinetic
diff --git a/fake_joint_launch/launch/ur5.launch → fake_joint_launch/launch/ur5.launch.kinetic b/fake_joint_launch/launch/ur5.launch → fake_joint_launch/launch/ur5.launch.kinetic
diff --git a/fake_joint_launch/launch/vs060.launch b/fake_joint_launch/launch/vs060.launch
diff --git a/fake_joint_launch/package.xml b/fake_joint_launch/package.xml
@@ -20,14 +20,9 @@
 
   <exec_depend>abb_irb2400_support</exec_depend>
   <exec_depend>controller_manager</exec_depend>
-  <exec_depend>denso_ros_control</exec_depend>
-  <exec_depend>nextage_description</exec_depend>
   <exec_depend>pr2_description</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>rviz</exec_depend>
-  <exec_depend>tra1_description</exec_depend>
-  <exec_depend>ur_description</exec_depend>
-  <exec_depend>vs060</exec_depend>
 
   <export></export>