Skip to content

Commit

Permalink
Merge pull request #586 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
IC: Caelum-rc4+dev23
  • Loading branch information
dzbaker authored Oct 3, 2022
2 parents 7281299 + ef44a74 commit 0c1c863
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: c
languages: cpp
config-file: nasa/cFS/.github/codeql/codeql-${{matrix.scan-type}}.yml@main

- name: Build
Expand Down
2 changes: 1 addition & 1 deletion apps/ci_lab
2 changes: 1 addition & 1 deletion apps/sample_app
2 changes: 1 addition & 1 deletion apps/sch_lab
2 changes: 1 addition & 1 deletion libs/sample_lib
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 67 files
+6 −0 README.md
+1 −1 src/os/inc/osapi-version.h
+1 −1 src/os/portable/os-impl-no-symtab.c
+1 −1 src/os/portable/os-impl-posix-dl-loader.c
+1 −1 src/os/portable/os-impl-posix-dl-symtab.c
+2 −2 src/os/portable/os-impl-posix-io.c
+1 −1 src/os/portable/os-impl-posix-network.c
+3 −3 src/os/posix/src/os-impl-binsem.c
+1 −1 src/os/posix/src/os-impl-common.c
+1 −1 src/os/posix/src/os-impl-filesys.c
+1 −1 src/os/posix/src/os-impl-heap.c
+1 −1 src/os/posix/src/os-impl-idmap.c
+1 −1 src/os/posix/src/os-impl-loader.c
+1 −1 src/os/posix/src/os-impl-no-module.c
+10 −10 src/os/posix/src/os-impl-tasks.c
+2 −2 src/os/posix/src/os-impl-timebase.c
+1 −1 src/os/rtems/src/os-impl-binsem.c
+1 −1 src/os/rtems/src/os-impl-common.c
+2 −2 src/os/rtems/src/os-impl-countsem.c
+1 −1 src/os/rtems/src/os-impl-filesys.c
+2 −2 src/os/rtems/src/os-impl-heap.c
+1 −1 src/os/rtems/src/os-impl-loader.c
+1 −1 src/os/rtems/src/os-impl-mutex.c
+1 −1 src/os/rtems/src/os-impl-network.c
+1 −1 src/os/rtems/src/os-impl-no-module.c
+1 −1 src/os/rtems/src/os-impl-queues.c
+3 −3 src/os/rtems/src/os-impl-tasks.c
+1 −1 src/os/rtems/src/os-impl-timebase.c
+1 −1 src/os/shared/src/osapi-common.c
+3 −3 src/os/shared/src/osapi-file.c
+1 −1 src/os/shared/src/osapi-filesys.c
+6 −6 src/os/shared/src/osapi-module.c
+2 −2 src/os/shared/src/osapi-network.c
+1 −1 src/os/shared/src/osapi-task.c
+1 −1 src/os/vxworks/src/os-impl-binsem.c
+1 −1 src/os/vxworks/src/os-impl-common.c
+1 −1 src/os/vxworks/src/os-impl-countsem.c
+1 −1 src/os/vxworks/src/os-impl-heap.c
+5 −5 src/os/vxworks/src/os-impl-loader.c
+1 −1 src/os/vxworks/src/os-impl-mutex.c
+1 −1 src/os/vxworks/src/os-impl-network.c
+1 −1 src/os/vxworks/src/os-impl-no-module.c
+1 −1 src/os/vxworks/src/os-impl-queues.c
+8 −8 src/os/vxworks/src/os-impl-symtab.c
+2 −2 src/os/vxworks/src/os-impl-tasks.c
+1 −1 src/os/vxworks/src/os-impl-timebase.c
+0 −7 src/tests/osal-core-test/osal-core-test.c
+1 −1 src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
+5 −5 src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c
+2 −2 src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c
+3 −3 src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c
+4 −4 src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c
+11 −11 src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c
+1 −1 src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c
+1 −1 src/unit-tests/osfile-test/ut_osfile_test.c
+0 −1 src/unit-tests/osloader-test/ut_module.c
+2 −2 ut_assert/src/utassert.c
+1 −1 ut_assert/src/utlist.c
+3 −3 ut_assert/src/utstubs.c
+19 −17 ut_assert/src/uttools.c
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 31 files
+279 −0 CHANGELOG.md
+0 −264 README.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+6 −6 fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c
+9 −9 fsw/mcp750-vxworks/src/cfe_psp_memory.c
+1 −1 fsw/mcp750-vxworks/src/cfe_psp_ssr.c
+1 −1 fsw/mcp750-vxworks/src/cfe_psp_watchdog.c
+9 −9 fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c
+13 −13 fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c
+7 −7 fsw/modules/eeprom_notimpl/cfe_psp_eeprom_notimpl.c
+10 −10 fsw/modules/port_direct/cfe_psp_port_direct.c
+6 −6 fsw/modules/port_notimpl/cfe_psp_port_notimpl.c
+10 −10 fsw/modules/ram_direct/cfe_psp_ram_direct.c
+6 −6 fsw/modules/ram_notimpl/cfe_psp_ram_notimpl.c
+1 −1 fsw/pc-linux/inc/psp_version.h
+10 −10 fsw/pc-linux/src/cfe_psp_memory.c
+1 −1 fsw/pc-linux/src/cfe_psp_ssr.c
+3 −3 fsw/pc-linux/src/cfe_psp_support.c
+1 −1 fsw/pc-linux/src/cfe_psp_watchdog.c
+1 −1 fsw/pc-rtems/inc/psp_version.h
+0 −1 fsw/pc-rtems/src/cfe_psp_exception.c
+8 −8 fsw/pc-rtems/src/cfe_psp_memory.c
+1 −1 fsw/pc-rtems/src/cfe_psp_ssr.c
+3 −3 fsw/pc-rtems/src/cfe_psp_support.c
+1 −1 fsw/pc-rtems/src/cfe_psp_watchdog.c
+12 −12 fsw/shared/src/cfe_psp_memrange.c
+2 −2 fsw/shared/src/cfe_psp_memutils.c
+1 −1 unit-test-coverage/modules/CMakeLists.txt
+1 −1 unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
+3 −3 unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c
+11 −11 unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
2 changes: 1 addition & 1 deletion tools/tblCRCTool

0 comments on commit 0c1c863

Please sign in to comment.