From 2cf36382e4a25b7ea4c5df966a25c348d2e451db Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Thu, 27 May 2021 12:35:36 -0400
Subject: [PATCH] IC:2021-06-01, cfe, osal, sch_lab

- nasa/cFS#263, bundle

Combines:

- nasa/cFE#1584, v6.8.0-rc1+dev642
- nasa/osal#1058, v5.1.0-rc1+dev500
- nasa/sch_lab#82, v2.4.0-rc1+dev36

Includes:

- nasa/cfe#1580, Update ES verify errors to match test
- nasa/cfe#1578, Resolve mismatched endforeach of CMakeList.txt
- nasa/cfe#1579, Improve event filter documentation
- nasa/cfe#1576, EVS/FS documentation cleanup
- nasa/cfe#1575, Remove shell file subtype and clarify scope
- nasa/cfe#1582, Simplify file open/truncate logic
- nasa/cfe#1567, Remove deprecated elements
- nasa/cfe#1556, Replace Header Content Type magic number
- nasa/cfe#1553, Remove unused EVS LogMode defines
- nasa/cfe#1570, Document cleanup from SB/MSG/SBR review, Remove unused CFE_SB_NO_SUBSCRIBERS
- nasa/cfe#1565, Add CFE_SB_DestinationD tag and use for pointers
- nasa/cfe#1564, Use CFE_MSG_SequenceCount_t for seqcnt type
- nasa/cfe#1562, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
- nasa/cfe#1560, Documentation cleanup in TBL/TIME
- nasa/cfe#1558, Document TblName as app specific
- nasa/cfe#1563, use OSAL script to generate API guide
- nasa/cfe#1557, Include verify headers to validate config
- nasa/cfe#1555, add doxygen aliases for OSAL parameter/retvals

- nasa/osal#1033, include doxygen targets locally
- nasa/osal#1031, Document OS_ObjectIdToArrayIndex as public
- nasa/osal#1040, resolve discrepancies between binsem API and unit tests
- nasa/osal#1029, add missing clock retcode tests
- nasa/osal#1046, resolve discrepancies between common API and unit tests
- nasa/osal#1041, resolve discrepancies between countsem API and unit tests
- nasa/osal#1045, resolve discrepancies between dir API and unit tests
- nasa/osal#1043, resolve discrepancies between module API and unit tests
- nasa/osal#1044, resolve discrepancies between mutex API and unit tests
- nasa/osal#1038, resolve discrepancies between queue API and unit tests
- nasa/osal#1037, resolve discrepancies between task API and unit tests
- nasa/osal#1051, resolve discrepancies between timebase API and unit tests
- nasa/osal#1030, check misc API return codes
- nasa/osal#1039, Rename CodeQL cFE Build and add Duplicate Job
- nasa/osal#1049, filter only whole words for keyword match
- nasa/osal#962, update OSAL Config Guide link

- nasa/sch_lab#81, exit the main loop if init fails

- HOTFIX cFS-bundle, Use new osalguide logfile to fix documentation build
workflow errors,
---
 .github/workflows/build-documentation.yml | 12 ++++++------
 apps/sch_lab                              |  2 +-
 cfe                                       |  2 +-
 osal                                      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 3ba6c8f0f..851206dc1 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -9,7 +9,7 @@ env:
   SIMULATION: native
 
 jobs:
-  #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. 
+  #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
   checks-for-duplicates:
     runs-on: ubuntu-latest
     # Map a step output to a job output
@@ -157,7 +157,7 @@ jobs:
   build-osalguide:
     # Name the Job
     needs: checks-for-duplicates
-    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}    
+    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
     name: Osal Guide
     # Set the type of machine to run on
     runs-on: ubuntu-18.04
@@ -186,7 +186,7 @@ jobs:
       - name: Build OSAL Guide
         run: |
           make osalguide > make_osalguide_stdout.txt 2> make_osalguide_stderr.txt
-          mv build/doc/warnings.log osalguide_warnings.log
+          mv build/doc/osalguide/osal-apiguide-warnings.log osal-apiguide-warnings.log
 
 
       - name: Archive Osal Guide Build Logs
@@ -196,7 +196,7 @@ jobs:
           path: |
             make_osalguide_stdout.txt
             make_osalguide_stderr.txt
-            osalguide_warnings.log
+            osal-apiguide-warnings.log
 
 
       - name: Error Check
@@ -208,8 +208,8 @@ jobs:
 
       - name: Warning Check
         run: |
-          if [[ -s osalguide_warnings.log ]]; then
-            cat osalguide_warnings.log
+          if [[ -s osal-apiguide-warnings.log ]]; then
+            cat osal-apiguide-warnings.log
             exit -1
           fi
 
diff --git a/apps/sch_lab b/apps/sch_lab
index 4a1b72e5a..80c7197f8 160000
--- a/apps/sch_lab
+++ b/apps/sch_lab
@@ -1 +1 @@
-Subproject commit 4a1b72e5a3092369b49d5c65f325bc48e1f7f832
+Subproject commit 80c7197f84c582934b4f9de071bf332cfb8867ab
diff --git a/cfe b/cfe
index 176e3df03..a16c78e18 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit 176e3df03f54f7753cb34beb3e986202604d6cef
+Subproject commit a16c78e1853c9b46ce5d1efae882ea5bf3a170cf
diff --git a/osal b/osal
index 677605094..c54068855 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 677605094498564928f1ce334a1571e30bc9171c
+Subproject commit c540688551bdaffd4f150b0edf51a1bc3c175d25