Skip to content

Commit

Permalink
Merge pull request nasa#263 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
cFS Bundle Integration Candidate: 2021-06-01
  • Loading branch information
astrogeco authored Jun 8, 2021
2 parents c26cd28 + b0c92ee commit fb2968d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
SIMULATION: native

jobs:
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
checks-for-duplicates:
runs-on: ubuntu-latest
# Map a step output to a job output
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
build-osalguide:
# Name the Job
needs: checks-for-duplicates
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
name: Osal Guide
# Set the type of machine to run on
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- name: Build OSAL Guide
run: |
make osalguide > make_osalguide_stdout.txt 2> make_osalguide_stderr.txt
mv build/doc/warnings.log osalguide_warnings.log
mv build/doc/osalguide/osal-apiguide-warnings.log osal-apiguide-warnings.log
- name: Archive Osal Guide Build Logs
Expand All @@ -196,7 +196,7 @@ jobs:
path: |
make_osalguide_stdout.txt
make_osalguide_stderr.txt
osalguide_warnings.log
osal-apiguide-warnings.log
- name: Error Check
Expand All @@ -208,8 +208,8 @@ jobs:
- name: Warning Check
run: |
if [[ -s osalguide_warnings.log ]]; then
cat osalguide_warnings.log
if [[ -s osal-apiguide-warnings.log ]]; then
cat osal-apiguide-warnings.log
exit -1
fi
Expand Down
2 changes: 1 addition & 1 deletion apps/sch_lab
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 57 files
+68 −5 .github/workflows/codeql-build.yml
+1 −1 CMakeLists.txt
+26 −0 README.md
+0 −1 cmake/Makefile.sample
+5 −0 cmake/cfe-common.doxyfile.in
+8 −15 cmake/mission_build.cmake
+0 −78 cmake/osal-common.doxyfile.in
+0 −18 cmake/osalguide.doxyfile.in
+1 −13 docs/cFE Application Developers Guide.md
+0 −8 docs/cFE_FunctionalRequirements.csv
+0 −1 docs/src/cfe_api.dox
+0 −94 docs/src/osal_fs.dox
+0 −8 docs/src/osal_timer.dox
+0 −121 docs/src/osalmain.dox
+0 −19 modules/core_api/fsw/inc/cfe_error.h
+7 −4 modules/core_api/fsw/inc/cfe_es.h
+4 −28 modules/core_api/fsw/inc/cfe_evs.h
+3 −1 modules/core_api/fsw/inc/cfe_evs_api_typedefs.h
+2 −3 modules/core_api/fsw/inc/cfe_fs.h
+7 −11 modules/core_api/fsw/inc/cfe_fs_extern_typedefs.h
+1 −1 modules/core_api/fsw/inc/cfe_msg_api_typedefs.h
+11 −8 modules/core_api/fsw/inc/cfe_sb.h
+5 −30 modules/core_api/fsw/inc/cfe_sb_api_typedefs.h
+26 −42 modules/core_api/fsw/inc/cfe_tbl.h
+15 −12 modules/core_api/fsw/inc/cfe_time.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+2 −16 modules/core_api/ut-stubs/src/cfe_evs_stubs.c
+1 −1 modules/core_private/fsw/inc/cfe_evs_log_typedef.h
+10 −10 modules/core_private/fsw/inc/cfe_sb_destination_typedef.h
+1 −1 modules/core_private/fsw/inc/cfe_sbr.h
+3 −22 modules/es/fsw/src/cfe_es_task.c
+5 −5 modules/es/fsw/src/cfe_es_verify.h
+0 −17 modules/es/ut-coverage/es_UT.c
+2 −2 modules/evs/fsw/inc/cfe_evs_events.h
+0 −4 modules/evs/fsw/inc/cfe_evs_msg.h
+1 −25 modules/evs/fsw/src/cfe_evs.c
+11 −41 modules/evs/fsw/src/cfe_evs_task.c
+1 −1 modules/evs/fsw/src/cfe_evs_task.h
+1 −1 modules/evs/fsw/src/cfe_evs_utils.c
+1 −1 modules/evs/fsw/src/cfe_evs_utils.h
+6 −22 modules/evs/ut-coverage/evs_UT.c
+1 −1 modules/fs/fsw/src/cfe_fs_api.c
+2 −1 modules/msg/option_inc/default_cfe_msg_hdr_pri.h
+2 −1 modules/msg/option_inc/default_cfe_msg_hdr_priext.h
+2 −2 modules/sb/fsw/src/cfe_sb_api.c
+1 −0 modules/sb/fsw/src/cfe_sb_task.c
+1 −1 modules/sbr/CMakeLists.txt
+1 −1 modules/sbr/fsw/src/cfe_sbr_route_unsorted.c
+1 −2 modules/tbl/fsw/src/cfe_tbl_api.c
+1 −1 modules/tbl/fsw/src/cfe_tbl_internal.c
+9 −13 modules/tbl/fsw/src/cfe_tbl_internal.h
+1 −0 modules/tbl/fsw/src/cfe_tbl_task.c
+1 −1 modules/tbl/fsw/src/cfe_tbl_task_cmds.c
+3 −1 modules/tbl/fsw/src/cfe_tbl_task_cmds.h
+0 −7 modules/tbl/fsw/src/cfe_tbl_verify.h
+1 −0 modules/time/fsw/src/cfe_time_task.c
+0 −3 modules/time/fsw/src/cfe_time_tone.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 46 files
+16 −1 .github/workflows/codeql-cfe-build.yml
+8 −4 CMakeLists.txt
+23 −1 README.md
+88 −0 doc/src/CMakeLists.txt
+16 −0 doc/src/osal-apiguide.doxyfile.in
+76 −0 doc/src/osal-common.doxyfile.in
+94 −0 doc/src/osal_fs.dox
+8 −0 doc/src/osal_timer.dox
+121 −0 doc/src/osalmain.dox
+10 −12 src/os/inc/osapi-binsem.h
+4 −2 src/os/inc/osapi-clock.h
+2 −3 src/os/inc/osapi-common.h
+21 −15 src/os/inc/osapi-countsem.h
+17 −6 src/os/inc/osapi-dir.h
+1 −0 src/os/inc/osapi-heap.h
+21 −11 src/os/inc/osapi-module.h
+9 −10 src/os/inc/osapi-mutex.h
+1 −0 src/os/inc/osapi-network.h
+14 −12 src/os/inc/osapi-queue.h
+1 −1 src/os/inc/osapi-shell.h
+14 −14 src/os/inc/osapi-task.h
+13 −6 src/os/inc/osapi-timebase.h
+34 −26 src/os/inc/osapi-timer.h
+6 −5 src/os/inc/osapi-version.h
+7 −18 src/os/shared/src/osapi-idmap.c
+1 −1 src/os/shared/src/osapi-time.c
+92 −46 src/tests/time-base-api-test/time-base-api-test.c
+22 −4 src/tests/timer-add-api-test/timer-add-api-test.c
+2 −2 src/unit-test-coverage/shared/src/coveragetest-time.c
+8 −0 src/unit-tests/inc/ut_os_support.h
+34 −15 src/unit-tests/oscore-test/ut_oscore_misc_test.c
+1 −0 src/unit-tests/oscore-test/ut_oscore_misc_test.h
+9 −0 src/unit-tests/oscore-test/ut_oscore_queue_test.c
+61 −3 src/unit-tests/oscore-test/ut_oscore_task_test.c
+1 −0 src/unit-tests/oscore-test/ut_oscore_task_test.h
+2 −0 src/unit-tests/oscore-test/ut_oscore_test.c
+86 −35 src/unit-tests/osfile-test/ut_osfile_dirio_test.c
+13 −6 src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+20 −5 src/unit-tests/osloader-test/ut_osloader_module_test.c
+4 −1 src/unit-tests/osloader-test/ut_osloader_symtable_test.c
+1 −0 src/unit-tests/ostimer-test/ut_ostimer_test.c
+26 −1 src/unit-tests/ostimer-test/ut_ostimer_test.h
+94 −55 src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c
+0 −68 src/unit-tests/ostimer-test/ut_ostimer_timerio_test.h
+2 −2 src/ut-stubs/osapi-timebase-stubs.c
+12 −6 ut_assert/scripts/generate_stubs.pl

0 comments on commit fb2968d

Please sign in to comment.