Merge pull request #443 from nasa/integration-candidate

cFS Integration Candidate: Caelum-rc4+dev6
nasa · Mar 17, 2022 · eb32159 · eb32159
2 parents fcd8eb7 + fe39e27
commit eb32159
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -55,6 +55,8 @@ jobs:
       - name: Build Docs
         run: |
           make doc > make_doc_stdout.txt 2> make_doc_stderr.txt
+          mv build/docs/detaildesign-warnings.log detaildesign-warnings.log
+
       # Upload documentation logs as artifacts
       - name: Archive Documentation Build Logs
         uses: actions/upload-artifact@v2
@@ -63,13 +65,22 @@ jobs:
           path: |
             make_doc_stdout.txt
             make_doc_stderr.txt
+            detaildesign-warnings.log
+
       - name: Error Check
         run: |
           if [[ -s make_doc_stderr.txt ]]; then
             cat make_doc_stderr.txt
             exit -1
           fi
 
+      - name: Warning Check
+        run: |
+          if [[ -s detaildesign-warnings.log ]]; then
+            cat detaildesign-warnings.log
+            exit -1
+          fi
+
   build:
     needs: checks-for-duplicates
     if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
@@ -134,7 +145,7 @@ jobs:
         if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           mkdir deploy
-          cd ./build/docs/osalguide/apiguide/latex
+          cd ./build/docs/osalguide/latex
           make > build.txt
           mv refman.pdf $GITHUB_WORKSPACE/deploy/OSAL_Users_Guide.pdf
           # Could add pandoc and convert to github markdown
@@ -143,7 +154,8 @@ jobs:
       - name: Build Usersguide
         run: |
           make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt
-          
+          mv build/docs/users_guide/cfe-usersguide-warnings.log cfe-usersguide-warnings.log
+
       - name: Archive Users Guide Build Logs
         uses: actions/upload-artifact@v2
         with:
@@ -206,4 +218,4 @@ jobs:
           FOLDER: deploy
           CLEAN: false
           SINGLE_COMMIT: true
-
+
diff --git a/cfe b/cfe
diff --git a/osal b/osal
+4 −4		.github/workflows/build-documentation.yml
+6 −0		README.md
+5 −3		cmake/cfe-usersguide.doxyfile.in
+0 −1		cmake/mission-detaildesign.doxyfile.in
+0 −2		cmake/mission_build.cmake
+1 −1		docs/src/cfs_versions.dox
+4 −4		modules/core_api/fsw/inc/cfe_version.h
+4 −3		.github/workflows/codeql-cfe-build.yml
+9 −0		README.md
+1 −1		docs/osal-detaildesign.doxyfile.in
+12 −7		docs/src/CMakeLists.txt
+2 −4		docs/src/osal-apiguide.doxyfile.in
+4 −1		docs/src/osal-common.doxyfile.in
+4 −5		src/os/inc/osapi-version.h
+4 −0		src/os/rtems/inc/os-rtems.h
+52 −5		src/os/rtems/src/os-impl-loader.c