Skip to content

Commit

Permalink
Fix #487, added -f to rm for the components
Browse files Browse the repository at this point in the history
  • Loading branch information
havencarlson committed Jun 10, 2022
1 parent 325bf9e commit b8f6ff0
Show file tree
Hide file tree
Showing 21 changed files with 298 additions and 160 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build-deploy-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

build-doc:
needs: checks-for-duplicates
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }}
name: Build Documentation
runs-on: ubuntu-18.04

Expand All @@ -58,6 +58,12 @@ jobs:
target: ${{ fromJson(inputs.target) }}

steps:
- name: Reject non-compatible deployment settings
if: ${{ inputs.deploy == true && inputs.cache-key != '' }}
run: |
echo "Deployment when using cache not supported due to password fail issue"
exit -1
- name: Get cache if supplied
id: cache-src-bld
if: ${{ inputs.cache-key != '' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
checkout-and-cache:
name: Custom checkout and cache for cFS documents
needs: checks-for-duplicates
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }}
runs-on: ubuntu-latest

steps:
Expand All @@ -50,7 +50,7 @@ jobs:

deploy-documentation:
needs: build-cfs-documentation
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main') }}
name: Deploy documentation to gh-pages
runs-on: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
git log -1 --pretty=oneline
git submodule
rm -r .git
rm -r ${{ inputs.component-path }}
rm -rf ${{ inputs.component-path }}
ln -s ${{github.workspace}} ${{ inputs.component-path }}
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,31 @@ jobs:
cat style_differences.txt
exit -1
fi
check-commit-message:
name: Check Commit Message
needs: check-for-duplicates
# Only run for pull-requests.
if: ${{ github.event_name == 'pull_request' }}
runs-on: ubuntu-18.04
timeout-minutes: 15
steps:
# Check github pull-request title against the pattern.
- name: Check pull-request title
uses: gsactions/commit-message-checker@v1
with:
pattern: '^((Fix|HotFix|Part)\s\#[0-9]+,\s[a-zA-Z0-9]+|Merge\spull\srequest\s\#[0-9]+\s[a-zA-Z0-9]+|IC:\s[a-zA-Z0-9]+)'
error: 'You need at least one "Fix|HotFix|Part #<issue number>, <short description>" line in the pull-request title.'
excludeDescription: 'true'
excludeTitle: 'false'
checkAllCommitMessages: 'false'
# Check each commit message associated with the pull-request against the pattern.
- name: Check each commit message
uses: gsactions/commit-message-checker@v1
with:
pattern: '^((Fix|HotFix|Part)\s\#[0-9]+,\s[a-zA-Z0-9]+|Merge\spull\srequest\s\#[0-9]+\s[a-zA-Z0-9]+|IC:\s[a-zA-Z0-9]+)'
error: 'You need at least one "Fix|HotFix|Part #<issue number>, <short description>" line in the commit message.'
excludeDescription: 'true'
excludeTitle: 'true'
checkAllCommitMessages: 'true'
accessToken: ${{ secrets.GITHUB_TOKEN }}
379 changes: 238 additions & 141 deletions CONTRIBUTING.md

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ This bundle has not been fully verified as an operational system, and is provide
The cFS Framework is a core subset of cFS. There are additional OSALs, PSPs, and tools as listed below available from a variety of sources.

## References Documentation
- cFE User's Guide: https://github.com/nasa/cFS/blob/gh-pages/cFE_Users_Guide.pdf
- OSAL User's Guide: https://github.com/nasa/cFS/blob/gh-pages/OSAL_Users_Guide.pdf
- cFE User's Guide: https://github.com/nasa/cFS/blob/gh-pages/cfe-usersguide.pdf
- OSAL User's Guide: https://github.com/nasa/cFS/blob/gh-pages/osal-apiguide.pdf
- Combined Mission documentation: https://github.com/nasa/cFS/blob/gh-pages/mission-doc.pdf
- cFE App Developer's Guide: https://github.com/nasa/cFE/blob/main/docs/cFE%20Application%20Developers%20Guide.md
- Training documentation: https://ntrs.nasa.gov/citations/20210022378
- cFS Overview: https://cfs.gsfc.nasa.gov/cFS-OviewBGSlideDeck-ExportControl-Final.pdf
Expand Down Expand Up @@ -150,7 +151,7 @@ The following list is user submitted, and not CCB controlled. They are released
- cFS-101: Virtual machine distribution at https://github.com/nasa/CFS-101
- OpenSatKit: Open source kit for satellite software at https://github.com/OpenSatKit/OpenSatKit
- Other Ground station software
- TBD
- cFS-EDS-GroundStation: Ground station implemented via EDS at https://github.com/nasa/cFS-EDS-GroundStation
- Other Apps
- CS: Checksum application at https://github.com/nasa/CS
- CF: CFDP application at https://github.com/nasa/CF
Expand All @@ -162,6 +163,7 @@ The following list is user submitted, and not CCB controlled. They are released
- LC: Limit Checker application at https://github.com/nasa/LC
- MD: Memory Dwell application at https://github.com/nasa/MD
- MM: Memory Manager application at https://github.com/nasa/MM
- SBN: Software Bus Network application at https://github.com/nasa/SBN
- SC: Stored Commands application at https://github.com/nasa/SC
- SCA: Stored Command Absolute application at https://github.com/nasa/SCA
- SCH: Scheduler application at https://github.com/nasa/SCH
Expand All @@ -170,13 +172,18 @@ The following list is user submitted, and not CCB controlled. They are released
- Other Interfaces
- SIL: Simulink Interface Layer at https://github.com/nasa/SIL
- ECI: External Code Interface at https://github.com/nasa/ECI
- SBN-Client: External code interface to SBN at https://github.com/nasa/SBN-Client
- Other Libraries
- cFS_IO_LIB: IO library at https://github.com/nasa/CFS_IO_LIB
- cFS_LIB: at https://github.com/nasa/cfs_lib
- EdsLib: CCSDS SOIS Electronic Data Sheet Tool and Library at https://github.com/nasa/EdsLib
- fs_lib: File services library at https://github.com/nasa/fs_lib
- Other Tools
- CTF: cFS Test Framework at https://github.com/nasa/CTF
- CCDD: Command and Data Dictionary Tool at https://github.com/nasa/CCDD
- Perfutils-java: Java based performance analyzer for cFS at https://github.com/nasa/perfutils-java
- gen_sch_tbl: Tool to generated SCH app tables
- gen_sch_tbl: Tool to generated SCH app tables at https://github.com/nasa/gen_sch_tbl
- CryptoLib: Software-only CCSDS Space Data Link Security Protocol - Extended Procedures (SDLS-EP) at https://github.com/nasa/CryptoLib
- Other OSALs
- TBD
- Other PSPs
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 apps/to_lab
Binary file added cFS_Apps_Corporate_CLA.pdf
Binary file not shown.
Binary file added cFS_Apps_Individual_CLA.pdf
Binary file not shown.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 43 files
+27 −2 .github/workflows/build-documentation.yml
+20 −1 README.md
+10 −8 cmake/sample_defs/arch_build_custom.cmake
+2 −0 cmake/sample_defs/sample_mission_cfg.h
+48 −31 cmake/sample_defs/toolchain-i686-rtems4.11.cmake
+52 −39 cmake/sample_defs/toolchain-i686-rtems5.cmake
+93 −0 cmake/sample_defs/toolchain-i686-rtems6.cmake
+1 −1 docs/cFE Application Developers Guide.md
+4 −0 modules/cfe_testcase/src/es_cds_test.c
+7 −0 modules/cfe_testcase/src/es_counter_test.c
+12 −8 modules/cfe_testcase/src/es_info_test.c
+7 −5 modules/cfe_testcase/src/es_mempool_test.c
+8 −5 modules/cfe_testcase/src/es_resource_id_test.c
+7 −5 modules/cfe_testcase/src/es_task_test.c
+7 −1 modules/cfe_testcase/src/fs_header_test.c
+2 −0 modules/cfe_testcase/src/fs_util_test.c
+7 −0 modules/cfe_testcase/src/resource_id_misc_test.c
+6 −6 modules/cfe_testcase/src/sb_pipe_mang_test.c
+14 −9 modules/cfe_testcase/src/sb_sendrecv_test.c
+7 −7 modules/cfe_testcase/src/sb_subscription_test.c
+6 −3 modules/cfe_testcase/src/tbl_content_access_test.c
+2 −2 modules/cfe_testcase/src/tbl_content_mang_test.c
+11 −6 modules/cfe_testcase/src/tbl_information_test.c
+3 −3 modules/cfe_testcase/src/tbl_registration_test.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+2 −2 modules/es/fsw/src/cfe_es_api.c
+5 −4 modules/es/fsw/src/cfe_es_apps.c
+3 −0 modules/es/fsw/src/cfe_es_backgroundtask.c
+3 −1 modules/es/fsw/src/cfe_es_start.c
+1 −1 modules/es/fsw/src/cfe_es_syslog.c
+13 −12 modules/es/fsw/src/cfe_es_task.c
+15 −12 modules/es/ut-coverage/es_UT.c
+3 −0 modules/evs/fsw/src/cfe_evs_utils.c
+9 −1 modules/evs/ut-coverage/evs_UT.c
+16 −16 modules/msg/ut-coverage/test_msg_pri_not.c
+2 −2 modules/sb/fsw/src/cfe_sb_task.c
+215 −121 modules/sb/ut-coverage/sb_UT.c
+2 −2 modules/tbl/fsw/src/cfe_tbl_internal.c
+2 −2 modules/tbl/fsw/src/cfe_tbl_task_cmds.c
+6 −0 modules/tbl/ut-coverage/tbl_UT.c
+7 −3 modules/time/fsw/src/cfe_time_api.c
+2 −0 modules/time/fsw/src/cfe_time_utils.c
+62 −65 modules/time/ut-coverage/time_UT.c
2 changes: 1 addition & 1 deletion libs/sample_lib
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 56 files
+1 −3 .github/workflows/codeql-cfe-build.yml
+5 −4 .github/workflows/codeql-osal-default.yml
+15 −1 README.md
+8 −1 src/bsp/pc-rtems/build_options.cmake
+9 −4 src/bsp/pc-rtems/src/bsp_start.c
+3 −3 src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
+1 −1 src/os/inc/osapi-version.h
+78 −0 src/os/portable/os-impl-no-select.c
+2 −1 src/os/rtems/CMakeLists.txt
+9 −8 src/os/rtems/inc/os-rtems.h
+3 −1 src/os/rtems/src/os-impl-filesys.c
+1 −1 src/os/rtems/src/os-impl-loader.c
+8 −0 src/tests/bin-sem-flush-test/bin-sem-flush-test.c
+11 −3 src/tests/bin-sem-test/bin-sem-test.c
+9 −3 src/tests/bin-sem-timeout-test/bin-sem-timeout-test.c
+15 −11 src/tests/file-api-test/file-api-test.c
+26 −34 src/tests/idmap-api-test/idmap-api-test.c
+13 −7 src/tests/network-api-test/network-api-test.c
+2 −0 src/tests/osal-core-test/osal-core-test.c
+4 −4 src/tests/queue-test/queue-test.c
+4 −2 src/tests/select-test/select-test.c
+1 −1 src/tests/shell-test/shell-test.c
+1 −1 src/tests/symbol-api-test/symbol-api-test.c
+2 −4 src/tests/time-base-api-test/time-base-api-test.c
+3 −2 src/tests/timer-add-api-test/timer-add-api-test.c
+5 −3 src/tests/timer-test/timer-test.c
+4 −2 src/unit-test-coverage/shared/src/coveragetest-binsem.c
+4 −2 src/unit-test-coverage/shared/src/coveragetest-countsem.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-dir.c
+2 −0 src/unit-test-coverage/shared/src/coveragetest-errors.c
+2 −0 src/unit-test-coverage/shared/src/coveragetest-file.c
+6 −0 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+16 −6 src/unit-test-coverage/shared/src/coveragetest-idmap.c
+4 −2 src/unit-test-coverage/shared/src/coveragetest-module.c
+4 −2 src/unit-test-coverage/shared/src/coveragetest-mutex.c
+2 −2 src/unit-test-coverage/shared/src/coveragetest-queue.c
+4 −2 src/unit-test-coverage/shared/src/coveragetest-sockets.c
+3 −1 src/unit-test-coverage/shared/src/coveragetest-task.c
+9 −5 src/unit-test-coverage/shared/src/coveragetest-time.c
+7 −2 src/unit-test-coverage/shared/src/coveragetest-timebase.c
+3 −3 src/unit-test-coverage/ut-stubs/src/posix-stat-stubs.c
+2 −2 src/unit-test-coverage/ut-stubs/src/posix-time-stubs.c
+1 −0 src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c
+1 −1 src/unit-test-coverage/vxworks/src/coveragetest-countsem.c
+1 −1 src/unit-test-coverage/vxworks/src/coveragetest-network.c
+1 −1 src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
+9 −7 src/unit-tests/oscore-test/ut_oscore_binsem_test.c
+8 −6 src/unit-tests/oscore-test/ut_oscore_countsem_test.c
+13 −6 src/unit-tests/oscore-test/ut_oscore_misc_test.c
+7 −7 src/unit-tests/oscore-test/ut_oscore_mutex_test.c
+8 −8 src/unit-tests/oscore-test/ut_oscore_queue_test.c
+4 −0 src/unit-tests/oscore-test/ut_oscore_task_test.c
+5 −4 src/unit-tests/osfile-test/ut_osfile_dirio_test.c
+5 −1 src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+4 −4 src/unit-tests/osloader-test/ut_osloader_module_test.c
+2 −2 src/unit-tests/osloader-test/ut_osloader_symtable_test.c
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
2 changes: 1 addition & 1 deletion tools/elf2cfetbl
2 changes: 1 addition & 1 deletion tools/tblCRCTool

0 comments on commit b8f6ff0

Please sign in to comment.