From b4fd76b2637686b64d064682bcc13ceeeb7e31f1 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Fri, 28 May 2021 11:54:57 -0400
Subject: [PATCH] IC:2021-06-01, HOTFIX documentation build errors

cFE, Remove deprecataed items from doxygen references
osal, rename osalguide warnings log files
cFS-Bundle, use new osalguide logfile in documentation build workflow
---
 .github/workflows/build-documentation.yml | 12 ++++++------
 cfe                                       |  2 +-
 osal                                      |  2 +-
 3 files changed, 8 insertions(+), 8 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/cfe b/cfe
index d71583ae8..acea60e6a 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit d71583ae89af584fbf465990f0ed1428af80f229
+Subproject commit acea60e6a7cc897ba41589191138f7b96d3728b3
diff --git a/osal b/osal
index 5edc586c2..a72eeb946 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 5edc586c2fcee79311630e6aeb9113699fcfca15
+Subproject commit a72eeb946d92368087c30598d5541647425e61ca