Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cFS Bundle Integration Candidate:2021-06-15 #265

Merged
merged 2 commits into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -111,7 +110,7 @@ jobs:
path: |
make_usersguide_stdout.txt
make_usersguide_stderr.txt
usersguide_warnings.log
cfe-usersguide-warnings.log


- name: Error Check
Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 62 files
+139 −0 .github/workflows/build-documentation.yml
+97 −0 .github/workflows/code-coverage.yml
+24 −1 README.md
+2 −2 cmake/Makefile.sample
+6 −16 cmake/arch_build.cmake
+6 −2 cmake/cfe-common.doxyfile.in
+3 −3 cmake/cfe-usersguide.doxyfile.in
+16 −9 cmake/global_functions.cmake
+6 −20 cmake/mission-detaildesign.doxyfile.in
+54 −37 cmake/mission_build.cmake
+1 −0 cmake/sample_defs/targets.cmake
+10 −11 cmake/target/src/target_config.c
+24 −28 docs/cFE_FunctionalRequirements.csv
+40 −69 docs/src/cfs_versions.dox
+1 −1 modules/cfe_assert/src/cfe_assert_init.c
+22 −0 modules/cfe_assert/src/cfe_assert_io.c
+29 −24 modules/cfe_assert/src/cfe_assert_runner.c
+2 −0 modules/cfe_testcase/CMakeLists.txt
+2 −0 modules/cfe_testcase/src/cfe_test.c
+2 −0 modules/cfe_testcase/src/cfe_test.h
+157 −0 modules/cfe_testcase/src/es_mempool_test.c
+75 −0 modules/cfe_testcase/src/es_misc_test.c
+1 −1 modules/cfe_testcase/src/fs_header_test.c
+7 −6 modules/core_api/fsw/inc/cfe_es.h
+2 −2 modules/core_api/fsw/inc/cfe_fs.h
+17 −6 modules/core_api/fsw/inc/cfe_tbl.h
+25 −26 modules/core_api/fsw/inc/cfe_version.h
+60 −119 modules/core_private/ut-stubs/src/ut_osprintf_stubs.c
+62 −66 modules/es/fsw/src/cfe_es_api.c
+29 −30 modules/es/fsw/src/cfe_es_apps.c
+3 −3 modules/es/fsw/src/cfe_es_backgroundtask.c
+17 −19 modules/es/fsw/src/cfe_es_cds.c
+3 −3 modules/es/fsw/src/cfe_es_cds_mempool.c
+4 −10 modules/es/fsw/src/cfe_es_erlog.c
+2 −2 modules/es/fsw/src/cfe_es_generic_pool.c
+12 −14 modules/es/fsw/src/cfe_es_mempool.c
+1 −1 modules/es/fsw/src/cfe_es_objtab.c
+1 −1 modules/es/fsw/src/cfe_es_perf.c
+41 −39 modules/es/fsw/src/cfe_es_start.c
+18 −14 modules/es/fsw/src/cfe_es_task.c
+1 −1 modules/evs/fsw/src/cfe_evs.c
+16 −16 modules/evs/fsw/src/cfe_evs_task.c
+2 −1 modules/evs/fsw/src/cfe_evs_utils.c
+13 −13 modules/evs/ut-coverage/evs_UT.c
+7 −15 modules/fs/fsw/src/cfe_fs_api.c
+5 −5 modules/fs/fsw/src/cfe_fs_priv.c
+6 −6 modules/fs/ut-coverage/fs_UT.c
+1 −1 modules/sb/fsw/src/cfe_sb_api.c
+2 −2 modules/sb/fsw/src/cfe_sb_init.c
+4 −4 modules/sb/fsw/src/cfe_sb_priv.c
+15 −13 modules/sb/fsw/src/cfe_sb_task.c
+3 −3 modules/sb/fsw/src/cfe_sb_util.c
+48 −54 modules/tbl/fsw/src/cfe_tbl_api.c
+23 −27 modules/tbl/fsw/src/cfe_tbl_internal.c
+8 −8 modules/tbl/fsw/src/cfe_tbl_task.c
+4 −4 modules/tbl/fsw/src/cfe_tbl_task_cmds.c
+3 −1 modules/time/fsw/inc/cfe_time_msg.h
+9 −1 modules/time/fsw/src/cfe_time_api.c
+21 −19 modules/time/fsw/src/cfe_time_task.c
+21 −0 modules/time/fsw/src/cfe_time_utils.c
+2 −2 modules/time/fsw/src/cfe_time_utils.h
+68 −4 modules/time/ut-coverage/time_UT.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 43 files
+2 −2 .github/pull_request_template.md
+68 −0 .github/workflows/build-osal-documentation.yml
+44 −2 .github/workflows/codeql-cfe-build.yml
+29 −2 .github/workflows/codeql-osal-default.yml
+1 −1 CMakeLists.txt
+22 −4 README.md
+ docs/GSC_18370_Corp_CLA_form_1219.pdf
+ docs/GSC_18370_Ind_CLA_form_1219.pdf
+2 −2 docs/OSAL-Configuration-Guide.md
+7 −0 docs/osal-detaildesign.doxyfile.in
+0 −0 docs/src/CMakeLists.txt
+0 −0 docs/src/osal-apiguide.doxyfile.in
+0 −0 docs/src/osal-common.doxyfile.in
+0 −0 docs/src/osal_fs.dox
+0 −0 docs/src/osal_timer.dox
+0 −0 docs/src/osalmain.dox
+29 −0 src/os/inc/osapi-error.h
+43 −31 src/os/inc/osapi-file.h
+37 −29 src/os/inc/osapi-filesys.h
+18 −17 src/os/inc/osapi-idmap.h
+34 −1 src/os/inc/osapi-select.h
+54 −21 src/os/inc/osapi-sockets.h
+1 −1 src/os/inc/osapi-version.h
+2 −1 src/os/portable/os-impl-bsd-sockets.c
+13 −1 src/os/shared/src/osapi-errors.c
+3 −5 src/os/shared/src/osapi-idmap.c
+1 −1 src/os/shared/src/osapi-select.c
+18 −1 src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c
+175 −81 src/tests/idmap-api-test/idmap-api-test.c
+235 −316 src/tests/network-api-test/network-api-test.c
+2 −2 src/tests/osal-core-test/osal-core-test.c
+244 −422 src/tests/select-test/select-test.c
+6 −1 src/unit-test-coverage/portable/src/coveragetest-bsd-sockets.c
+11 −8 src/unit-test-coverage/shared/src/coveragetest-idmap.c
+16 −13 src/unit-tests/oscore-test/ut_oscore_select_test.c
+38 −11 src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+10 −1 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.c
+2 −2 src/ut-stubs/osapi-select-stubs.c
+1 −1 src/ut-stubs/utstub-helpers.h
+14 −0 ut_assert/inc/utbsp.h
+43 −8 ut_assert/src/utassert.c
+14 −4 ut_assert/src/utbsp.c
+8 −0 ut_assert/src/uttest.c