Merge pull request nasa#590 from nasa/integration-candidate

IC: Caelum-rc4+dev25
chillfig · Oct 11, 2022 · 57168f4 · 57168f4
2 parents 06121e4 + 9e16f02
commit 57168f4
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 43 deletions.
diff --git a/.github/workflows/static-analysis-misra.yml b/.github/workflows/static-analysis-misra.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           submodules: true
 
-      - name: get MISRA addon
+      - name: Get MISRA addon
         run: |
             sudo apt-get install git -y
             git clone https://github.com/danmar/cppcheck.git
@@ -57,32 +57,70 @@ jobs:
       - name: Run bundle cppcheck
         if: ${{matrix.cppcheck =='bundle'}}
         run: |
+          cppcheck --addon=misra --force --inline-suppr --quiet . --xml 2> ${{matrix.cppcheck}}_cppcheck_err.xml 
           cppcheck --addon=misra --force --inline-suppr --quiet . 2> ${{matrix.cppcheck}}_cppcheck_err.txt
-          
+
         # Run strict static analysis for embedded portions of cfe, osal, and psp
       - name: cfe strict cppcheck
         if: ${{matrix.cppcheck =='cfe'}}
         run: |
           cd ${{matrix.cppcheck}}
-          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
+          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER --xml 2> ${{matrix.cppcheck}}_cppcheck_err.xml
+          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER 2> ${{matrix.cppcheck}}_cppcheck_err.txt
           
       - name: osal strict cppcheck
         if: ${{matrix.cppcheck =='osal'}}
         run: |
           cd ${{matrix.cppcheck}}
-          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./src/bsp ./src/os 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
+          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./src/bsp ./src/os --xml 2> ${{matrix.cppcheck}}_cppcheck_err.xml
+          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./src/bsp ./src/os 2> ${{matrix.cppcheck}}_cppcheck_err.txt
           
       - name: psp strict cppcheck
         if: ${{matrix.cppcheck =='psp'}}
         run: |
           cd ${{matrix.cppcheck}}
-          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./fsw 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
+          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./fsw --xml 2> ${{matrix.cppcheck}}_cppcheck_err.xml
+          cppcheck --addon=misra --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./fsw 2> ${{matrix.cppcheck}}_cppcheck_err.txt
+
+      - name: Convert bundle cppcheck to sarif 
+        uses: airtower-luna/convert-to-sarif@v0.2.0
+        if: ${{matrix.cppcheck =='bundle'}}
+        with:
+          tool: 'CppCheck'
+          input_file: '${{matrix.cppcheck}}_cppcheck_err.xml'
+          sarif_file: '${{matrix.cppcheck}}_cppcheck_err.sarif'
 
-      - name: Archive Static Analysis Artifacts
-        uses: actions/upload-artifact@v2
+      - name: Convert cfe, osal, psp cppcheck to sarif 
+        uses: airtower-luna/convert-to-sarif@v0.2.0
+        if: ${{matrix.cppcheck !='bundle'}}
+        with:
+          tool: 'CppCheck'
+          input_file: '${{matrix.cppcheck}}/${{matrix.cppcheck}}_cppcheck_err.xml'
+          sarif_file: '${{matrix.cppcheck}}_cppcheck_err.sarif'
+
+      - name: Define workspace
+        run: |
+          echo "CONTAINER_WORKSPACE=${PWD}" >> ${GITHUB_ENV}
+
+      - name: Archive bundle static analysis artifacts
+        uses: actions/upload-artifact@v3
+        if: ${{matrix.cppcheck =='bundle'}}
         with:
           name: ${{matrix.cppcheck}}-cppcheck-err
-          path: ./*cppcheck_err.txt
+          path: ./*cppcheck_err.*
+
+      - name: Archive osal, cfe, and psp static analysis artifacts
+        uses: actions/upload-artifact@v3
+        if: ${{matrix.cppcheck !='bundle'}}
+        with:
+          name: ${{matrix.cppcheck}}-cppcheck-err
+          path: ./${{matrix.cppcheck}}/*cppcheck_err.*
+
+      - name: Upload sarif results
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: '${{matrix.cppcheck}}_cppcheck_err.sarif'
+          checkout_path: ${{ env.CONTAINER_WORKSPACE }}
 
       - name: Check for errors
         run: |

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -48,22 +48,63 @@ jobs:
         with:
           submodules: true
 
-      - name: Run general cppcheck
-        run: cppcheck --force --inline-suppr . 2> general_cppcheck_err.txt
+      - name: Run general cppcheck 
+        run: |
+          cppcheck --force --inline-suppr . --xml 2> general_cppcheck_err.xml  
+          cppcheck --force --inline-suppr . 2> general_cppcheck_err.txt
+          
+      - name: Convert general cppcheck
+        uses: airtower-luna/convert-to-sarif@v0.2.0
+        with:
+          tool: 'CppCheck'
+          input_file: 'general_cppcheck_err.xml'
+          sarif_file: 'general_cppcheck_err.sarif'
+
+      - name: Define workspace
+        run: |
+          echo "CONTAINER_WORKSPACE=${PWD}" >> ${GITHUB_ENV}
+          
+      - name: Upload general SARIF results
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'general_cppcheck_err.sarif'
+          checkout_path: ${{ env.CONTAINER_WORKSPACE }}
 
+        # Run strict static analysis for embedded portions of cfe, osal, and psp
+      - name: Strict cppcheck
+        if: ${{ inputs.strict-dir-list !='' }}
+        run: |
+          cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ${{ inputs.strict-dir-list }} --xml 2> strict_cppcheck_err.xml 
+          cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ${{ inputs.strict-dir-list }} 2> strict_cppcheck_err.txt
+ 
+      - name: Convert strict cppcheck
+        uses: airtower-luna/convert-to-sarif@v0.2.0
+        if: ${{ inputs.strict-dir-list !='' }}
+        with:
+          tool: 'CppCheck'
+          input_file: 'strict_cppcheck_err.xml'
+          sarif_file: 'strict_cppcheck_err.sarif'
+
+      - name: Archive static analysis artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: cppcheck-errors
+          path: ./*cppcheck_err.*
+
+      - name: Upload strict SARIF results
+        uses: github/codeql-action/upload-sarif@v2
+        if: ${{ inputs.strict-dir-list !='' }}
+        with:
+          sarif_file: 'strict_cppcheck_err.sarif'
+          checkout_path: ${{ env.CONTAINER_WORKSPACE }}
+
       - name: Check for general errors
         run: |
           if [[ -s general_cppcheck_err.txt ]];
           then
             cat general_cppcheck_err.txt
             exit -1
           fi
-
-        # Run strict static analysis for embedded portions of cfe, osal, and psp
-      - name: Strict cppcheck
-        if: ${{ inputs.strict-dir-list !='' }}
-        run: cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ${{ inputs.strict-dir-list }} 2> strict_cppcheck_err.txt
-
       - name: Check for strict errors
         if: ${{ inputs.strict-dir-list !='' }}
         run: |
@@ -72,9 +113,3 @@ jobs:
             cat strict_cppcheck_err.txt
             exit -1
           fi
-
-      - name: Archive Static Analysis Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: cppcheck-errors
-          path: ./*cppcheck_err.txt
diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
 [![Build Linux](https://github.com/nasa/cfs/actions/workflows/build-cfs.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/build-cfs.yml)
 [![Build RTEMS 5](https://github.com/nasa/cFS/actions/workflows/build-cfs-rtems5.yml/badge.svg)](https://github.com/nasa/cFS/actions/workflows/build-cfs-rtems5.yml)
-[![LGTM Alerts](https://img.shields.io/lgtm/alerts/github/nasa/cFS.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/cFS/alerts/?mode=list)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/cpp/g/nasa/cFS.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/cFS/context:cpp)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/python/g/nasa/cFS.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/cFS/context:python)
 
 # Core Flight System - BUNDLE
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -24,14 +24,6 @@ CodeQL is ran for every push and pull-request on all branches of cFS in GitHub A
 
 For the CodeQL GitHub Actions setup, visit https://github.com/github/codeql-action.
 
-### LGTM
-
-LGTM [results](https://lgtm.com/projects/g/nasa/cFS?mode=list) are available to the public. Since suppression comments are not used, many warnings and errors may not be accurate. Therefore, the results may contain false positives and other inapplicable warnings and errors.
-
-LGTM is ran for every pull-request on all branches of cFS.
-
-For more information about LGTM, visit https://lgtm.com/.
-
 ### Cppcheck
 
 The [cFS Cppcheck GitHub Actions workflow and results](https://github.com/nasa/cFS/actions/workflows/static-analysis.yml) are available to the public. To view the results, select a workflow and download the artifacts.

diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/sample_app b/apps/sample_app
diff --git a/apps/sch_lab b/apps/sch_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/cfe b/cfe
diff --git a/libs/sample_lib b/libs/sample_lib
diff --git a/osal b/osal
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl
diff --git a/tools/tblCRCTool b/tools/tblCRCTool