Merge pull request #164 in SWDEV/franka_ros from bugfix/SRR-1221-lint…

…ing-githubworkflow to develop * commit '36fc74404943690e8e593c56be20a57731d02f67': Fix: Check python formatting in github workflow and added in Jenkinsfile
frankaemika · Dec 14, 2021 · 8efef62 · 8efef62
2 parents cbe64f9 + 36fc744
commit 8efef62
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git 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
@@ -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'