From 12349a39056db63b28874e2036883ee9695af295 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 4 Jan 2021 13:13:55 -0500 Subject: [PATCH 1/4] Fix #1054, Resolve osal guide generation warnings --- docs/src/osalmain.dox | 52 +++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/docs/src/osalmain.dox b/docs/src/osalmain.dox index 455626249..7502b6991 100644 --- a/docs/src/osalmain.dox +++ b/docs/src/osalmain.dox @@ -6,27 +6,37 @@ -
  • Core OS Module +
  • Core -
  • OS File System +
  • File System -
  • \subpage osapi-os-filesys.h "File System Module Reference" +
  • \subpage osapi-filesys.h "File System Reference" +
  • \subpage osapi-file.h "File Reference" +
  • \subpage osapi-dir.h "Directory Reference"
  • Object File Loader -
  • Network Module +
  • Network
  • Timer +
  • Semaphore and Mutex + **/ From 908c2c15efcad18ff98b5e80e15228d45499273b Mon Sep 17 00:00:00 2001 From: Chris Knight Date: Mon, 4 Jan 2021 14:51:14 -0800 Subject: [PATCH 2/4] fix #1059 - corrects documentation for CFE_SB_GetPipeName() stub --- fsw/cfe-core/ut-stubs/ut_sb_stubs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c index f527c873c..f34d7be20 100644 --- a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c +++ b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c @@ -201,9 +201,9 @@ int32 CFE_SB_DeletePipe(CFE_SB_PipeId_t PipeId) ** ** \par Description ** This function is used to mimic the response of the cFE SB function -** CFE_SB_GetPipeName. The user must set the value of UT_pipename prior -** to this function being called. The function uses UT_pipename for the -** retrieved pipe name and returns CFE_SUCCESS. +** CFE_SB_GetPipeName. The user should set the data buffer using UT_SetDataBuffer +** prior to this function being called. Otherwise, the dummy "UT" name will +** be copied to PipeNameBuf. ** ** \par Assumptions, External Events, and Notes: ** None From a7de9f22a6fb40287cc21cc3aae306a42ef0f8cc Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 5 Jan 2021 13:00:56 -0500 Subject: [PATCH 3/4] Fix #1064, Add cppcheck GitHub Actions workflow --- .github/workflows/static-analysis.yml | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/static-analysis.yml diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml new file mode 100644 index 000000000..ae884f00f --- /dev/null +++ b/.github/workflows/static-analysis.yml @@ -0,0 +1,50 @@ +name: Static Analysis + +# Run this workflow every time a new commit pushed to your repository +on: [push, pull_request] + +jobs: + + static-analysis: + name: Run cppcheck + runs-on: ubuntu-18.04 + + strategy: + fail-fast: false + matrix: + cppcheck: [all, cfe] + + steps: + + - name: Install cppcheck + run: sudo apt-get install cppcheck -y + + # Checks out a copy of the cfs bundle + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: true + + - name: Run bundle cppcheck + if: ${{matrix.cppcheck =='all'}} + run: cppcheck --force --inline-suppr --quiet . 2> ${{matrix.cppcheck}}_cppcheck_err.txt + + # Run strict static analysis for embedded portions of cfe + - name: cfe strict cppcheck + if: ${{matrix.cppcheck =='cfe'}} + run: | + cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./fsw/cfe-core/src ./modules 2> ./${{matrix.cppcheck}}_cppcheck_err.txt + + - name: Archive Static Analysis Artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{matrix.cppcheck}}-cppcheck-err + path: ./*cppcheck_err.txt + + - name: Check for errors + run: | + if [[ -s ${{matrix.cppcheck}}_cppcheck_err.txt ]]; + then + cat ${{matrix.cppcheck}}_cppcheck_err.txt + exit -1 + fi From 42ca5f9d478fb215180bc9df485b2cc3575a0100 Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Thu, 7 Jan 2021 12:48:05 -0500 Subject: [PATCH 4/4] Bump to v6.8.0-rc1+dev236 Also update Readme.md --- README.md | 7 +++++++ fsw/cfe-core/src/inc/cfe_version.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e5e1f7e05..660436101 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,13 @@ The detailed cFE user's guide can be viewed at + ### Development Build: 6.8.0-rc1+dev228 - Remove use of `osapi-os-loader.h` from ES UT. diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h index 7bafa0644..1212ec4c7 100644 --- a/fsw/cfe-core/src/inc/cfe_version.h +++ b/fsw/cfe-core/src/inc/cfe_version.h @@ -35,7 +35,7 @@ /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 228 /*!< Development Build: Number of commits since baseline */ +#define CFE_BUILD_NUMBER 236 /*!< Development Build: Number of commits since baseline */ #define CFE_BUILD_BASELINE "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */