From 53373fffdc7c0a000ef1e1890129da5715496365 Mon Sep 17 00:00:00 2001
From: jdfiguer <jdfiguer@Ubuntu20.04.myguest.virtualbox.org>
Date: Thu, 25 May 2023 16:18:30 -0400
Subject: [PATCH 1/3] Fix #662, Removes error on format style differences

---
 .github/workflows/format-check.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
index 44ce1b579..23c38d011 100644
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@@ -61,14 +61,6 @@ jobs:
           name: style_differences
           path: style_differences.txt
 
-      - name: Error on differences
-        run: |
-          if [[ -s style_differences.txt ]];
-          then
-            cat style_differences.txt
-            exit -1
-          fi
-
   check-commit-message:
     name: Check Commit Message
     needs: check-for-duplicates

From df34640f7ce77702ec87bd9f5443dd0d75e3742b Mon Sep 17 00:00:00 2001
From: Dan <daniel.m.knutsen@nasa.gov>
Date: Thu, 1 Jun 2023 10:23:10 -0400
Subject: [PATCH 2/3] Fix #679, Increase wait time in test workflow

---
 .github/workflows/build-cfs-deprecated.yml | 2 +-
 .github/workflows/build-cfs.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml
index 3539c92f7..04a927ee8 100644
--- a/.github/workflows/build-cfs-deprecated.yml
+++ b/.github/workflows/build-cfs-deprecated.yml
@@ -198,7 +198,7 @@ jobs:
             fi
             counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
             echo "Waiting for CFE Tests"
-            sleep 60
+            sleep 120
           done
 
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml
index 621421166..d9ab581ed 100644
--- a/.github/workflows/build-cfs.yml
+++ b/.github/workflows/build-cfs.yml
@@ -196,7 +196,7 @@ jobs:
             fi
             counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
             echo "Waiting for CFE Tests"
-            sleep 60
+            sleep 120
           done
 
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002

From dd8dbfb68bbfe45ee5fca2191d6ad2b487a89d13 Mon Sep 17 00:00:00 2001
From: Dylan <dylan.z.baker@nasa.gov>
Date: Thu, 1 Jun 2023 15:34:05 -0400
Subject: [PATCH 3/3] IC: Caelum-rc4+dev52 *Combines:*

cFE v7.0.0-rc4+dev334
osal v6.0.0-rc4+dev217

**Includes:**

*cFS*
- #680
- #676

*cFE*
- nasa/cFE#2350
- nasa/cFE#2354
- nasa/cFE#2355
- nasa/cFE#2366
- nasa/cFE#2364
- nasa/cFE#2356
- nasa/cFE#2361

*osal*
- nasa/osal#1393

Co-authored by: Daniel Knutsen <dmknutsen@users.noreply.github.com>
Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Chris Knight <cdknightnasa@users.noreply.github.com>
---
 cfe  | 2 +-
 osal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfe b/cfe
index b429d9130..2bf32994b 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit b429d9130cd7ba5230a5070aa981cbdcb899b717
+Subproject commit 2bf32994b623307075c6dd854a3f9ce040d2457f
diff --git a/osal b/osal
index 5036fed76..184ba9bb4 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 5036fed76e440232016d7413cafdd2bb796144ce
+Subproject commit 184ba9bb40f6eea2d1aed0ea6d0e041cf47d6b45