Merge branch 'kinetic_dev' of github.com:ipa320/cob_manipulation into…

… kinetic_release_candidate
ipa320 · Feb 19, 2024 · 88c40d2 · 88c40d2
2 parents eb42e62 + 37f640b
commit 88c40d2
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 89 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,40 @@
+name: GHA CI
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 0" # every Sunday at midnight
+  workflow_dispatch:
+
+jobs:
+  industrial_ci:
+    name: GHA CI
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    env:
+      ADDITIONAL_DEBS: 'apt-utils dialog git'
+      CATKIN_LINT: pedantic
+      CATKIN_LINT_ARGS: '--ignore description_boilerplate'
+      CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release
+      PYLINT_ARGS: '--output-format=parseable --errors-only'
+      PYLINT_CHECK: true
+      ROS_REPO: main
+
+    strategy:
+      matrix:
+        include:
+          - { ROS_DISTRO: noetic, TARGET_WORKSPACE: '. -cob_manipulation/cob_obstacle_distance_moveit -cob_manipulation/cob_manipulation' }
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+          lfs: true
+          ssh-known-hosts: ''
+
+      - uses: ros-industrial/industrial_ci@master
+        with:
+          config: ${{toJSON(matrix)}}
+
diff --git a/.travis.rosinstall b/.travis.rosinstall
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,25 +1,7 @@
 cob_manipulation
 ===========
 
-## ROS Distro Support
+## GitHub Actions - Continuous Integration
 
-|         | Indigo | Jade | Kinetic |
-|:-------:|:------:|:----:|:-------:|
-| Branch  | [`indigo_dev`](https://github.com/ipa320/cob_manipulation/tree/indigo_dev) | [`indigo_dev`](https://github.com/ipa320/cob_manipulation/tree/indigo_dev) | [`kinetic_dev`](https://github.com/ipa320/cob_manipulation/tree/kinetic_dev) |
-| Status  |  supported | not supported |  supported |
-| Version | [version](http://repositories.ros.org/status_page/ros_indigo_default.html?q=cob_manipulation) | [version](http://repositories.ros.org/status_page/ros_jade_default.html?q=cob_manipulation) | [version](http://repositories.ros.org/status_page/ros_kinetic_default.html?q=cob_manipulation) |
+CI-Status ```kinetic_dev```: [![GHA CI](https://github.com/ipa320/cob_manipulation/actions/workflows/main.yml/badge.svg?branch=kinetic_dev)](https://github.com/ipa320/cob_manipulation/actions/workflows/main.yml?query=branch%3Akinetic_dev)
 
-## Travis - Continuous Integration
-
-Status: [![Build Status](https://app.travis-ci.com/ipa320/cob_manipulation.svg?branch=kinetic_dev)](https://app.travis-ci.com/ipa320/cob_manipulation)
-
-## ROS Buildfarm
-
-|         | Indigo Source | Indigo Debian | Jade Source | Jade Debian |  Kinetic Source  |  Kinetic Debian |
-|:-------:|:-------------------:|:-------------------:|:-------------------:|:-------------------:|:-------------------:|:-------------------:|
-| cob_manipulation | [![not released](http://build.ros.org/buildStatus/icon?job=Isrc_uT__cob_manipulation__ubuntu_trusty__source)](http://build.ros.org/view/Isrc_uT/job/Isrc_uT__cob_manipulation__ubuntu_trusty__source/) | [![not released](http://build.ros.org/buildStatus/icon?job=Ibin_uT64__cob_manipulation__ubuntu_trusty_amd64__binary)](http://build.ros.org/view/Ibin_uT64/job/Ibin_uT64__cob_manipulation__ubuntu_trusty_amd64__binary/) | [![not released](http://build.ros.org/buildStatus/icon?job=Jsrc_uT__cob_manipulation__ubuntu_trusty__source)](http://build.ros.org/view/Jsrc_uT/job/Jsrc_uT__cob_manipulation__ubuntu_trusty__source/) | [![not released](http://build.ros.org/buildStatus/icon?job=Jbin_uT64__cob_manipulation__ubuntu_trusty_amd64__binary)](http://build.ros.org/view/Jbin_uT64/job/Jbin_uT64__cob_manipulation__ubuntu_trusty_amd64__binary/) | [![not released](http://build.ros.org/buildStatus/icon?job=Ksrc_uX__cob_manipulation__ubuntu_xenial__source)](http://build.ros.org/view/Ksrc_uX/job/Ksrc_uX__cob_manipulation__ubuntu_xenial__source/) | [![not released](http://build.ros.org/buildStatus/icon?job=Kbin_uX64__cob_manipulation__ubuntu_xenial_amd64__binary)](http://build.ros.org/view/Kbin_uX64/job/Kbin_uX64__cob_manipulation__ubuntu_xenial_amd64__binary/) |
-
-
-This is a repository for Care-O-bot manipulation packages.
-
-Installation instructions and tutorials can be found at http://www.care-o-bot.org.
diff --git a/cob_collision_monitor/CHANGELOG.rst b/cob_collision_monitor/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_collision_monitor
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_collision_monitor/package.xml b/cob_collision_monitor/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>cob_collision_monitor</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>The collision monitor uses the planning scene monitor to read the state of the robot and check it for collision with itselt or the environment. It addition a ground plane is added in any case. Can be used as a stand-aloan node or a move_group capability.</description>
 
   <maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>

diff --git a/cob_grasp_generation/CHANGELOG.rst b/cob_grasp_generation/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_grasp_generation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_grasp_generation/package.xml b/cob_grasp_generation/package.xml
@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cob_grasp_generation</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>
      Grasp generation for Care-O-bot based on OpenRAVE
   </description>

diff --git a/cob_lookat_action/CHANGELOG.rst b/cob_lookat_action/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_lookat_action
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_lookat_action/package.xml b/cob_lookat_action/package.xml
@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cob_lookat_action</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>
      cob_lookat_action
   </description>

diff --git a/cob_manipulation/CHANGELOG.rst b/cob_manipulation/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_manipulation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_manipulation/package.xml b/cob_manipulation/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>cob_manipulation</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>The cob_manipulation stack includes packages that provide manipulation capabilities for Care-O-bot.</description>
 
   <maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>

diff --git a/cob_manipulation_msgs/CHANGELOG.rst b/cob_manipulation_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_manipulation_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_manipulation_msgs/package.xml b/cob_manipulation_msgs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>cob_manipulation_msgs</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>Messages for cob_manipulation</description>
 
   <license>BSD</license>

diff --git a/cob_moveit_bringup/CHANGELOG.rst b/cob_moveit_bringup/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_moveit_bringup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_moveit_bringup/package.xml b/cob_moveit_bringup/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>cob_moveit_bringup</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>
      MoveIt launch files
   </description>

diff --git a/cob_moveit_interface/CHANGELOG.rst b/cob_moveit_interface/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package cob_moveit_interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.9 (2024-02-19)
+------------------
+
 0.7.8 (2023-01-04)
 ------------------
 

diff --git a/cob_moveit_interface/package.xml b/cob_moveit_interface/package.xml
@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cob_moveit_interface</name>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
   <description>
      cob_moveit_interface
   </description>