IC: Caelum-rc4+dev12

*Combines:* osal v6.0.0-rc4+dev93 ci_lab v2.5.0-rc4+dev22 to_lab v2.5.0-rc4+dev24 sch_lab v2.5.0-rc4+dev31 **Includes:** - nasa/osal#1265, Set OSAL Loader unit test number of modules to OSAL_CONFIG_MAX_MODULES *Update Minimum CMake Version* - nasa/osal#1267, Update minimum required cmake version - nasa/ci_lab#113, update cmake_minimum_required - nasa/sch_lab#117, update cmake_minimum_required Co-authored by: Jacob Hageman <[email protected]> Co-authored by: Ariel Adams <[email protected]> Co-authored by: Joseph Hickey <[email protected]>
nasa · Jul 8, 2022 · bbd81ec · bbd81ec
2 parents 89d0bda + cce10ef
commit bbd81ec
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 150 deletions.
diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml
@@ -111,7 +111,7 @@ jobs:
         working-directory: ${{env.BUILD_DIRECTORY}}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: c
           config-file: nasa/cFS/.github/codeql/codeql-${{matrix.scan-type}}.yml@main
@@ -121,13 +121,25 @@ jobs:
         working-directory: ${{env.BUILD_DIRECTORY}}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
         with:
           add-snippets: true
           category: ${{matrix.scan-type}}
-
+          upload: false
+          output: CodeQL-Sarif-${{ matrix.scan-type }}
+
+      - name: Rename Sarif
+        run: |
+          mv CodeQL-Sarif-${{ matrix.scan-type }}/cpp.sarif CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif
+          sed -i 's/"name" : "CodeQL"/"name" : "CodeQL-${{ matrix.scan-type }}"/g' CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif
+          
       - name: Archive Sarif
         uses: actions/upload-artifact@v2
         with:
           name: CodeQL-Sarif-${{ matrix.scan-type }}
-          path: /home/runner/work/${{env.REPO}}/results/cpp.sarif
+          path: CodeQL-Sarif-${{ matrix.scan-type }}
+
+      - name: Upload SARIF
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif
diff --git a/.travis.yml b/.travis.yml
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/sch_lab b/apps/sch_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/osal b/osal
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,5 +1,4 @@
 # CMake snippet for building the host-side tools.
-cmake_minimum_required(VERSION 2.6.4)
 project(CFETOOLS C)
 
 add_subdirectory(cFS-GroundSystem/Subsystems/cmdUtil)