From 36fc74404943690e8e593c56be20a57731d02f67 Mon Sep 17 00:00:00 2001
From: Fabio Falezza <fabio.falezza@franka.de>
Date: Fri, 10 Dec 2021 16:21:06 +0100
Subject: [PATCH] Fix: Check python formatting in github workflow and added in
 Jenkinsfile

---
 .github/workflows/ci.yml | 12 +++++++++++-
 Jenkinsfile              | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00c4a2a64..6b1791118 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           cd /ros
           catkin_make -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
-    - name: Check Format
+    - name: Check C++ Format
       if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: addnab/docker-run-action@v3
       with:
@@ -74,6 +74,16 @@ jobs:
         run: |
           source /ros/devel/setup.bash
           cmake --build /ros/build --target check-format
+    
+    - name: Check Python Format
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
+      uses: addnab/docker-run-action@v3
+      with:
+        image:    franka_ros:${{matrix.ros_distro}}
+        options:  -v ${{github.workspace}}:/ros/
+        shell:    bash
+        run: |
+          source /ros/devel/setup.bash
           cmake --build /ros/build --target check-pyformat
 
     - name: Check Linting
diff --git a/Jenkinsfile b/Jenkinsfile
index 8d4e1a3e7..9daf1f2a0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -74,7 +74,7 @@ pipeline {
                             '''
                         }
                     }
-                    stage('Check Format') {
+                    stage('Check C++ Format') {
                         when {
                             environment name: 'BUILD_TOOL', value: 'catkin_make'
                         }
@@ -84,6 +84,16 @@ pipeline {
                             '''
                         }
                     }
+                    stage('Check Python Format') {
+                        when {
+                            environment name: 'BUILD_TOOL', value: 'catkin_make'
+                        }
+                        steps {
+                            sh '''
+                                cmake --build build --target check-pyformat
+                            '''
+                        }
+                    }
                     stage('Check Linting') {
                         when {
                             environment name: 'BUILD_TOOL', value: 'catkin_make'