Merge pull request in SWDEV/franka_ros from SRR-1130-drop-kinetic to …

…develop * commit 'ff292d8a34b0ae63d1751e60ec73525847de03ff': CHANGE: Drop Kinetic Support
frankaemika · Sep 28, 2021 · cf28809 · cf28809
2 parents 054af53 + ff292d8
commit cf28809
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/.ci/Dockerfile.kinetic b/.ci/Dockerfile.kinetic
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,6 @@ on:
 
   pull_request:
     branches:
-    - kinetic-devel
     - melodic-devel
     - noetic-devel
     - develop
@@ -17,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ros_distro: [ kinetic, melodic, noetic ]
+        ros_distro: [ melodic, noetic ]
     steps:
     - name: Prepare
       # Keep the compilation outputs persitant outside the docker container to use for the other steps

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.x - UNRELEASED
 
 * Add `joint_state_desired` publisher to `franka_gazebo`
+* No further ROS Kinetic support, since [End-of-Life was in April 2021](http://wiki.ros.org/Distributions)
 
 ## 0.8.1 - 2021-09-08
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -63,7 +63,6 @@ node {
 }
 
 parallel(
-  'kinetic': getStages('kinetic', 'xenial'),
   'melodic': getStages('melodic', 'bionic'),
   'noetic': getStages('noetic', 'focal'),
 )