From 0e8d4df8acad5f97d2e3414da7267e0f1f4b6bad Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 10 Jun 2021 17:49:41 -0400 Subject: [PATCH 1/2] IC:2021-06-15, psp, osal, cfe nasa/cFE#1619 - cfe v6.8.0-rc1+dev693 nasa/osal#1076 - osal v5.1.0-rc1+dev530 nasa/PSP#296 - psp v1.5.0-rc1+dev118 *Documentation Updates:* nasa/cfe#1598, Updated FS Read/WriteHeader API return documentation nasa/cfe#1601, Document CFE_ES_RunLoop increment task counter behavior nasa/cfe#1602, Document CFE_TBL_Unregister use-case nasa/cfe#1603, Update version description per current design *Standardize docs generation:* nasa/cfe#1615, standardize on "docs" subdirectory nasa/osal#1071, rename doc to docs nasa/psp#294, rename doc to docs *Coding Standard:* nasa/osal#1042 nasa/psp#292 **Mutex for UTAssert** nasa/cfe#1596, provide CFE assert lock/unlock nasa/osal#1065, add mutex lock around UtAssert globals *Resolve API-UT discrepancies:* nasa/osal#1055, idmap API nasa/osal#1056, file API nasa/osal#1057, filesys API nasa/osal#1060, socket API nasa/osal#1064, select API **Other cFE Fixes** nasa/cfe#1566, Simplify CFE_FS_SetTimestamp and fix syslog typo nasa/cfe#1592, Removed redundant check/set of CFE_CPU_ID_VALUE nasa/cfe#1593, add time get reference error bit nasa/cfe#1600, Add workflow to build cFE documentation nasa/cfe#1609, Requirements updates nasa/cfe#1610, ES/ResourceID documentation cleanup nasa/cfe#1613, allow multiple sources in add_cfe_coverage_test nasa/cfe#1586, add ES Misc Functional test nasa/cfe#1607, add Mempool functional tests nasa/cfe#1605, Clean/simplify version header and reporting nasa/cfe#1612, doxygen cleanup nasa/cfe#1611, Prepend system log messages with function name **Other osal Fixes** nasa/osal#1063, const correct OS_SelectFdIsSet nasa/osal#1073, Fix OS_Select doxygen errors nasa/osal#1073, Add missing OS_Select param doc nasa/osal#1067, Add Workflow to build and verify OSAL API Guide nasa/osal#1070, add detail design template nasa/osal#1072, Update error codes and documentation nasa/osal#1075, Increase UT object limit for testing Co-authored-by: Jacob Hageman Co-authored-by: Joseph Hickey Co-authored-by: Ariel Adams Co-authored-by: Alex Campbell Co-authored-by: Jose F Martinez Pedraza --- cfe | 2 +- osal | 2 +- psp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfe b/cfe index a16c78e18..d03e24e67 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit a16c78e1853c9b46ce5d1efae882ea5bf3a170cf +Subproject commit d03e24e675fcd253222e40a5c544920e03854c5f diff --git a/osal b/osal index c54068855..a3b7012ee 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit c540688551bdaffd4f150b0edf51a1bc3c175d25 +Subproject commit a3b7012ee09a6c2fdbd3506a861b1fa9908d9f49 diff --git a/psp b/psp index efef92127..6d40816cf 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit efef92127a4f26945ad6cb256dd7a0a17b9b3568 +Subproject commit 6d40816cfcc2836182f04bacf7d98b7d5cf5163b From 2b3e6590fb33d59083fa6dbf9d627a80ed779d64 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:17:34 -0400 Subject: [PATCH 2/2] IC:2021-06-15, HOTFIX, Docs CI workflow Update directories for osalguide and usersguide warning logfiles in build-documentation.yml --- .github/workflows/build-documentation.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 851206dc1..696e05b6a 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -102,7 +102,6 @@ jobs: - name: Build Usersguide run: | make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt - mv build/doc/warnings.log usersguide_warnings.log - name: Archive Users Guide Build Logs uses: actions/upload-artifact@v2 @@ -111,7 +110,7 @@ jobs: path: | make_usersguide_stdout.txt make_usersguide_stderr.txt - usersguide_warnings.log + cfe-usersguide-warnings.log - name: Error Check @@ -123,8 +122,8 @@ jobs: - name: Warning Check run: | - if [[ -s usersguide_warnings.log ]]; then - cat usersguide_warnings.log + if [[ -s cfe-usersguide-warnings.log ]]; then + cat cfe-usersguide-warnings.log exit -1 fi @@ -138,7 +137,7 @@ jobs: run: | set -x mkdir deploy - cd ./build/doc/users_guide/latex + cd ./build/docs/users_guide/latex make > build.txt mv refman.pdf $GITHUB_WORKSPACE/deploy/cFE_Users_Guide.pdf # Could add pandoc and convert to github markdown @@ -186,7 +185,7 @@ jobs: - name: Build OSAL Guide run: | make osalguide > make_osalguide_stdout.txt 2> make_osalguide_stderr.txt - mv build/doc/osalguide/osal-apiguide-warnings.log osal-apiguide-warnings.log + mv build/docs/osalguide/osal-apiguide-warnings.log osal-apiguide-warnings.log - name: Archive Osal Guide Build Logs @@ -222,7 +221,7 @@ jobs: if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} run: | mkdir deploy - cd ./build/doc/osalguide/latex + cd ./build/docs/osalguide/latex make > build.txt mv refman.pdf $GITHUB_WORKSPACE/deploy/OSAL_Users_Guide.pdf # Could add pandoc and convert to github markdown