From 151bab91efcee12ad14665ba135e5dc1544df659 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Wed, 21 Apr 2021 22:16:25 -0400
Subject: [PATCH 1/3] IC:2021-04-20, Add context check to docs deploy step

Checks for the github context so the workflow only runs the deploy step when
it runs on a push event to the main branch
---
 .github/workflows/build-documentation.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 84d619e07..6f7f6d9cb 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -127,12 +127,12 @@ jobs:
           fi
 
       - name: PDF generation installs
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra
 
       - name: PDF generation
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           set -x
           mkdir deploy
@@ -143,7 +143,7 @@ jobs:
           # pandoc CFE_Users_Guide.pdf -t gfm
 
       - name: Deploy
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -210,12 +210,12 @@ jobs:
           fi
 
       - name: PDF generation installs
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra
 
       - name: PDF generation
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           mkdir deploy
           cd ./build/doc/osalguide/latex
@@ -225,7 +225,7 @@ jobs:
           # pandoc CFE_Users_Guide.pdf -t gfm
 
       - name: Deploy
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 8efa7c9531221e0587c5371f430a3ea6e93613ec Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Wed, 21 Apr 2021 22:28:06 -0400
Subject: [PATCH 2/3] IC:2021-04-20, Check for duplicates for all jobs in docs
 workflow

Adds the "needs" and "if" statement to use the check-for-duplicates action to the usersguide and osalguide documentation jobs.
---
 .github/workflows/build-documentation.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 6f7f6d9cb..3ba6c8f0f 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -72,6 +72,8 @@ jobs:
 
   build-usersguide:
     # Name the Job
+    needs: checks-for-duplicates
+    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
     name: Users Guide
     # Set the type of machine to run on
     runs-on: ubuntu-18.04
@@ -154,6 +156,8 @@ jobs:
 
   build-osalguide:
     # Name the Job
+    needs: checks-for-duplicates
+    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

From 8872aecd6036396cef249a93009bf4d20385c021 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Wed, 21 Apr 2021 21:37:45 -0400
Subject: [PATCH 3/3] IC:2021-04-20, Update cFE, osal, cFS-GroundSystem

Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cfe#1290, Split interface and implementation modules
nasa/cfe#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cfe#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
---
 cfe                    | 2 +-
 osal                   | 2 +-
 tools/cFS-GroundSystem | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfe b/cfe
index e80aae94e..73c338d54 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit e80aae94e0f56b868657daba965c590766a4dc57
+Subproject commit 73c338d544f85cb0c1a97b743d3ae9f7a35039b5
diff --git a/osal b/osal
index b37da18bd..afb5f7ba3 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit b37da18bd5efed6d86344e4cafaa42c833b015fb
+Subproject commit afb5f7ba3ea48823e44490ce4258aa92a073087f
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
index b4bd97943..5deb0f034 160000
--- a/tools/cFS-GroundSystem
+++ b/tools/cFS-GroundSystem
@@ -1 +1 @@
-Subproject commit b4bd97943513b37d767f4201c3830c308a6c0a49
+Subproject commit 5deb0f0341f2ccd78ce1d9ca26e82dac5ccc11d0