Merge pull request #578 from nasa/integration-candidate

IC: Caelum-rc4+dev22
nasa · Sep 16, 2022 · 7281299 · 7281299
2 parents f117110 + e47d942
commit 7281299
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,16 +2,7 @@ name: "CodeQL Analysis: cFS-Bundle"
 
 on:
   push:
-    paths-ignore: 
-    - '**/*.md'
-    - '**/*.txt'
-    - '**/*.dox'
-
   pull_request:
-    paths-ignore: 
-    - '**/*.md'
-    - '**/*.txt'
-    - '**/*.dox'
 
 jobs:
   codeql:

diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml
@@ -138,13 +138,23 @@ jobs:
           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: filter-sarif
+        uses: zbazztian/filter-sarif@master
+        with:
+            patterns: |
+                -**/*.md
+                -**/*.txt
+                -**/*.dox
+            input: CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif
+            output: 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: CodeQL-Sarif-${{ matrix.scan-type }}
 
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
@@ -91,6 +91,7 @@ jobs:
       # Check each commit message associated with the pull-request against the pattern.
       - name: Check each commit message
         uses: gsactions/commit-message-checker@v1
+        if: always()
         with:
           pattern: '^((Fix|HotFix|Part)\s\#[0-9]+,\s[a-zA-Z0-9]+|Merge\spull\srequest\s\#[0-9]+\s[a-zA-Z0-9]+|IC:\s[a-zA-Z0-9]+)'
           error: 'You need at least one "Fix|HotFix|Part #<issue number>, <short description>" line in the commit message.'

diff --git a/cfe b/cfe
+4 −0		README.md
+8 −8		docs/src/cfe_api.dox
+2 −103		docs/src/cfe_es.dox
+69 −109		docs/src/cfe_evs.dox
+2 −2		docs/src/cfe_frontpage.dox
+109 −167		docs/src/cfe_sb.dox
+93 −134		docs/src/cfe_tbl.dox
+2 −125		docs/src/cfe_time.dox
+4 −4		docs/src/cfs_versions.dox
+1 −10		modules/cfe_assert/inc/cfe_assert.h
+1 −1		modules/core_api/fsw/inc/cfe_version.h
+0 −4		modules/sb/fsw/src/cfe_sb_priv.h