Part #686, resolve conflict

.github/workflows/add-to-project.yml

@@ -0,0 +1,13 @@
+name: Add Issue or PR to Project
+
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened, ready_for_review, converted_to_draft]
+
+jobs:
+  add-to-project:
+    name: Add issue or pull request to project
+    uses: nasa/cFS/.github/workflows/add-to-project-reusable.yml@dev
+    secrets: inherit

.github/workflows/static-analysis.yml

@@ -1,3 +1,4 @@
+
 name: Static Analysis
 
 # Run on pull requests and by dispatch
@@ -50,8 +51,7 @@ jobs:
           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
@@ -60,4 +60,4 @@ jobs:
         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

@@ -1,4 +1,4 @@
-name: Internal Build And Run EdsLib Validation Tests
+name: Build And Run EdsLib Validation Tests
 
 on:
   push:
@@ -43,14 +43,14 @@ jobs:
     container: ghcr.io/core-flight-system/cfsbuildenv-linux:latest
     steps:
       - name: Cache EdsLib Source
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         id: cache-edslib
         with:
           path: ${{ github.workspace }}/source
           key: edslib-source-${{ github.sha }}
 
       - name: Cache OSAL Dependency
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         id: cache-osal
         with:
           path: ${{ github.workspace }}/osal-staging
@@ -88,15 +88,15 @@ jobs:
 
       # Note - caches were updated in "prepare-dependencies" job so all three of these should be a hit
       - name: Retrieve Cached EdsLib Source
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         id: restore-source
         with:
           path: ${{ github.workspace }}/source
           key: edslib-source-${{ github.sha }}
 
       - name: Retrieve Cached OSAL Dependency
         id: restore-osal
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/osal-staging
           key: edslib-dep-${{ env.UPSTREAM_OSAL_REPO }}@${{ env.UPSTREAM_OSAL_REF }}