Part #686, Update cFS Bundle for v7.0.1

.github/actions/setup-osal/action.yml

@@ -19,7 +19,7 @@ runs:
   using: 'composite'
   steps:
     - name: Checkout OSAL
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: ${{ inputs.upstream-repo }}
         ref: ${{ inputs.upstream-ref }}

.github/workflows/format-check-internal.yml

@@ -0,0 +1,19 @@
+name: Internal Format Check
+
+# Run on all push and pull requests
+on:
+  push:
+    branches:
+      - dev
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  workflow_dispatch:
+
+jobs:
+  format-check:
+    name: Run format check
+    uses: cFS/workflows/.github/workflows/format-check-reusable-internal.yml@dev

.github/workflows/format-check.yml

@@ -2,13 +2,18 @@ name: Format Check
 
 # Run on all push and pull requests
 on:
+  push:
+    branches:
+      - dev
+      - main
   pull_request:
     types:
       - opened
       - reopened
       - synchronize
+  workflow_dispatch:
 
 jobs:
   format-check:
     name: Run format check
-    uses: nasa/cFS/.github/workflows/format-check.yml@main
+    uses: nasa/cFS/.github/workflows/format-check.yml@dev

.github/workflows/static-analysis.yml

@@ -46,18 +46,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: source
 
       - name: CMake Setup
-        run: |
-          cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DENABLE_UNIT_TESTS=FALSE -B build -S source
+        run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DENABLE_UNIT_TESTS=FALSE -B build -S source
+
       - name: Run general cppcheck
         run: cppcheck --force --inline-suppr --xml --project=build/compile_commands.json 2> cppcheck_err.xml
 
       - name: Convert cppcheck results to Markdown
         run: xsltproc source/.github/scripts/cppcheck-output.xslt cppcheck_err.xml | tee $GITHUB_STEP_SUMMARY cppcheck_err.txt
 
       - name: Check for reported errors
-        run: tail -n 1 cppcheck_err.txt | grep -q '^\*\*0 error(s) reported\*\*$'
+        run: tail -n 1 cppcheck_err.txt | grep -q '^\*\*0 error(s) reported\*\*$'

.github/workflows/validation-test.yml

@@ -37,9 +37,9 @@ jobs:
 
   prepare-dependencies:
     name: Prepare Dependencies
-    runs-on: ubuntu-latest
     needs: checks-for-duplicates
     if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'dev') }}
+    runs-on: ubuntu-latest
     container: ghcr.io/core-flight-system/cfsbuildenv-linux:latest
     steps:
       - name: Cache EdsLib Source
@@ -58,7 +58,7 @@ jobs:
 
       - name: Checkout EdsLib
         if: steps.cache-edslib.outputs.cache-hit != 'True'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: source
 
@@ -73,7 +73,7 @@ jobs:
   build-and-test:
     name: Build EdsLib and Execute Tests
     needs: [prepare-dependencies]
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
     container: ghcr.io/core-flight-system/cfsbuildenv-linux:latest
 
     strategy:
@@ -109,6 +109,7 @@ jobs:
           sudo find /usr/local -type d -exec chmod go+rx {} \;
           sudo find /usr/local -type f -exec chmod go+r {} \;
           sudo find /usr/local -type f -path '*/bin/*' -exec chmod go+x {} \;
+
       - name: Refresh Dynamic Linker Cache
         run: sudo ldconfig
 
@@ -148,4 +149,4 @@ jobs:
           fi
           if [ -s '${{ env.MATRIX_ID }}/lcov-summary.xml' ]; then
             cat '${{ env.MATRIX_ID }}/lcov-summary.xml' >> $GITHUB_STEP_SUMMARY
-          fi
+          fi

cfecfs/CMakeLists.txt

@@ -24,9 +24,4 @@
 add_subdirectory(missionlib)
 add_subdirectory(eds2cfetbl)
 add_subdirectory(util)
-
-# the test executive is an optional component to provide a black-box
-# style test framework.  It is built using OSAL and UT-Assert.
-if (ENABLE_EDS_TESTEXEC)
-    add_subdirectory(testexecutive)
-endif (ENABLE_EDS_TESTEXEC)
+add_subdirectory(testrunner)