Skip to content

Commit

Permalink
Merge pull request nasa#252 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
cFS Bundle Integration candidate: 2021-05-04
  • Loading branch information
astrogeco committed May 5, 2021
2 parents c845253 + be3ae5b commit 8f3f360
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 4 deletions.
64 changes: 62 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ git push --force
## Writing High-Quality Code

1. Follow cFS code conventions (formatting, symbol naming, file naming, etc). Do *not* change/reformat existing code, except to address your changes.
- The cFS submodules uses the Format Check workflow to ensure users follow the [clang-format-10](https://releases.llvm.org/10.0.0/tools/clang/docs/ClangFormat.html) style.
- The cFS submodules uses the Format Check workflow to ensure users follow the [clang-format-10](https://github.com/nasa/cFS/blob/main/.clang-format) style. For more information on how to use the Format Check workflow, view [Using GitHub Actions Workflows](#using-github-actions-workflows).
- The [cFS_IdentifierNamingConvention document](https://github.com/nasa/cFE/blob/main/docs/cFS_IdentifierNamingConvention.md) provides a simple naming convention guide for cFE/cFS for commands and telemetry that simplifies the EDS to ground telemetry and commands database conversion.
- The [cFE Application Developers Guide](https://github.com/nasa/cFE/blob/main/docs/cFE%20Application%20Developers%20Guide.md) contains code conventions such as naming conventions for header files.

Expand All @@ -233,12 +233,72 @@ git push --force

4. For any changes to existing API's, alter the unit tests to cover the changes (and remove tests made irrelevant due to your changes).

5. Review the static code analyses results.
5. Review the static code analyses results from the Static Analysis and CodeQL Analysis workflows. For more information on how to use these workflows, view [Using GitHub Actions Workflows](#using-github-actions-workflows).
- Push code changes to the appropriate forked repository.
- Go to the Actions tab and enable GitHub Actions Workflow. The CodeQL Analyis and Static Analysis will be triggered for all pushed code.
- Review these workflows for any warnings or errors.
- Once successful, create a pull request.

### Using GitHub Actions Workflows

Several of our GitHub Actions Workflows are used to ensure pushed code and pull requests do not break cFS, create vulnerabilities, and follow our code conventions. Other workflows are used for documentation purposes.

Most of the workflows in the NASA/cFS repository will run for all branches when code is pushed and a pull request is created, except for the changelog workflow that runs manually.

All of our workflows will be available for forked repositories once enabled. To enable workflows, navigate to the Actions tab and click "I understand my workflows, go ahead and enable them".

#### View Failed Workflows

1. Navigate to Actions in the selected repository. For newly forked repositories, enable workflows after clicking on Actions.
2. In the left sidebar, click the workflow you want to view.
3. From the list of workflow runs, click the name of the run you want to see.
4. Under Jobs or in the visualization graph, click the failed job.
5. Any failed steps are automatically expanded to display the results.

#### View Workflow Results
1. Navigate to Actions in the selected repository. For newly forked repositories, enable workflows after clicking on Actions.
2. In the left sidebar, click the workflow you want to view.
3. From the list of workflow runs, click the name of the run you want to see.
4. Scroll to the bottom of the page and download the artifacts. For CodeQL results, navigate to the Security Tab and click Code scanning alerts. CodeQL results will only be avaiable on your forked repository.

or

1. In pull requests, click the Checks tab.
2. From the list of workflow runs, click the name of the run you want to see.
4. Scroll to the bottom of the page and download the artifacts. For CodeQL results, expand Code scanning alerts at the bottom of the list of checks and select CodeQL.

#### Configure Workflows

1. Workflows are under [.github/workflows](https://github.com/nasa/cFS/tree/main/).
2. Configure the files as needed. For more information on how to configure GitHub Actions, visit [Workflow syntax for GitHub Actions](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions).

#### Our Workflows
##### Format Check
[![Format Check](https://github.com/nasa/osal/actions/workflows/format-check.yml/badge.svg)](https://github.com/nasa/osal/actions/workflows/format-check.yml)

##### CodeQL Analysis
[![CodeQL Analaysis](https://github.com/nasa/cfs/actions/workflows/codeql-build.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/codeql-build.yml)

CodeQL uses a .yml file and a configuration file found at [.github/codeql](https://github.com/nasa/cFS/tree/main/.github/codeql).

##### Static Analaysis
[![Static Analaysis](https://github.com/nasa/cfs/actions/workflows/static-analysis.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/static-analysis.yml)

##### Deprecated Build, Test, and Run
[![Deprecated Build, Test, and Run](https://github.com/nasa/cfs/actions/workflows/build-cfs-deprecated.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/build-cfs-deprecated.yml)

##### Build, Test, and Run [OMIT_DEPRECATED=true]
[![Build, Test, and Run %5B OMIT_DEPRECATED=true %5B](https://github.com/nasa/cfs/actions/workflows/build-cfs.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/build-cfs.yml)

##### Documentation and Guides
[![Documentation and Guides](https://github.com/nasa/cfs/actions/workflows/build-documentation.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/build-documentation.yml)

##### Changelog
[![Changelog](https://github.com/nasa/cfs/actions/workflows/changelog.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/changelog.yml)

##### Local Unit Test
[![Local Unit Test](https://github.com/nasa/osal/actions/workflows/local_unit_test.yml/badge.svg)](https://github.com/nasa/osal/actions/workflows/local_unit_test.yml)

For more information on our GitHub Action Workflows, view our [Security Policy](https://github.com/nasa/cFS/security/policy).

## Quick Links to Submodules
Expand Down
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 82 files
+8 −1 README.md
+3 −0 modules/cfe_testcase/CMakeLists.txt
+3 −0 modules/cfe_testcase/src/cfe_test.c
+3 −0 modules/cfe_testcase/src/cfe_test.h
+90 −0 modules/cfe_testcase/src/es_cds_test.c
+111 −0 modules/cfe_testcase/src/fs_header_test.c
+126 −0 modules/cfe_testcase/src/time_current_test.c
+13 −2 modules/core_api/fsw/inc/cfe_es.h
+1 −1 modules/core_api/fsw/inc/cfe_fs_core_internal.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+394 −254 modules/es/fsw/src/cfe_es_api.c
+135 −164 modules/es/fsw/src/cfe_es_apps.c
+118 −69 modules/es/fsw/src/cfe_es_apps.h
+32 −31 modules/es/fsw/src/cfe_es_backgroundtask.c
+154 −141 modules/es/fsw/src/cfe_es_cds.c
+26 −14 modules/es/fsw/src/cfe_es_cds.h
+60 −50 modules/es/fsw/src/cfe_es_cds_mempool.c
+26 −2 modules/es/fsw/src/cfe_es_cds_mempool.h
+42 −49 modules/es/fsw/src/cfe_es_erlog.c
+116 −98 modules/es/fsw/src/cfe_es_generic_pool.c
+10 −0 modules/es/fsw/src/cfe_es_generic_pool.h
+21 −3 modules/es/fsw/src/cfe_es_global.h
+11 −6 modules/es/fsw/src/cfe_es_log.h
+108 −38 modules/es/fsw/src/cfe_es_mempool.c
+8 −0 modules/es/fsw/src/cfe_es_mempool.h
+72 −82 modules/es/fsw/src/cfe_es_perf.c
+8 −1 modules/es/fsw/src/cfe_es_perf.h
+95 −78 modules/es/fsw/src/cfe_es_resource.c
+108 −4 modules/es/fsw/src/cfe_es_resource.h
+45 −39 modules/es/fsw/src/cfe_es_start.c
+31 −2 modules/es/fsw/src/cfe_es_start.h
+81 −71 modules/es/fsw/src/cfe_es_syslog.c
+271 −220 modules/es/fsw/src/cfe_es_task.c
+179 −6 modules/es/fsw/src/cfe_es_task.h
+69 −49 modules/evs/fsw/src/cfe_evs.c
+39 −53 modules/evs/fsw/src/cfe_evs_log.c
+25 −2 modules/evs/fsw/src/cfe_evs_log.h
+244 −335 modules/evs/fsw/src/cfe_evs_task.c
+171 −1 modules/evs/fsw/src/cfe_evs_task.h
+147 −200 modules/evs/fsw/src/cfe_evs_utils.c
+69 −0 modules/evs/fsw/src/cfe_evs_utils.h
+117 −65 modules/fs/fsw/src/cfe_fs_api.c
+29 −52 modules/fs/fsw/src/cfe_fs_priv.c
+28 −0 modules/fs/fsw/src/cfe_fs_priv.h
+88 −33 modules/msg/fsw/src/cfe_msg_ccsdsext.c
+120 −45 modules/msg/fsw/src/cfe_msg_ccsdspri.c
+2 −2 modules/msg/fsw/src/cfe_msg_defaults.h
+8 −3 modules/msg/fsw/src/cfe_msg_init.c
+8 −3 modules/msg/fsw/src/cfe_msg_initdefaulthdr_pri.c
+8 −3 modules/msg/fsw/src/cfe_msg_initdefaulthdr_priext.c
+8 −4 modules/msg/fsw/src/cfe_msg_msgid_shared.c
+14 −10 modules/msg/fsw/src/cfe_msg_msgid_v1.c
+16 −6 modules/msg/fsw/src/cfe_msg_msgid_v2.c
+3 −3 modules/msg/fsw/src/cfe_msg_priv.h
+25 −14 modules/msg/fsw/src/cfe_msg_sechdr_checksum.c
+16 −8 modules/msg/fsw/src/cfe_msg_sechdr_fc.c
+16 −6 modules/msg/fsw/src/cfe_msg_sechdr_time.c
+28 −20 modules/resourceid/fsw/src/cfe_resourceid_api.c
+225 −212 modules/sb/fsw/src/cfe_sb_api.c
+75 −128 modules/sb/fsw/src/cfe_sb_buf.c
+29 −52 modules/sb/fsw/src/cfe_sb_init.c
+9 −4 modules/sb/fsw/src/cfe_sb_msg_id_util.c
+119 −154 modules/sb/fsw/src/cfe_sb_priv.c
+425 −26 modules/sb/fsw/src/cfe_sb_priv.h
+226 −244 modules/sb/fsw/src/cfe_sb_task.c
+61 −37 modules/sb/fsw/src/cfe_sb_util.c
+23 −9 modules/sbr/fsw/src/cfe_sbr_map_direct.c
+32 −12 modules/sbr/fsw/src/cfe_sbr_map_hash.c
+2 −0 modules/sbr/fsw/src/cfe_sbr_priv.h
+56 −24 modules/sbr/fsw/src/cfe_sbr_route_unsorted.c
+159 −88 modules/tbl/fsw/src/cfe_tbl_api.c
+249 −244 modules/tbl/fsw/src/cfe_tbl_internal.c
+46 −46 modules/tbl/fsw/src/cfe_tbl_internal.h
+49 −25 modules/tbl/fsw/src/cfe_tbl_task.c
+8 −8 modules/tbl/fsw/src/cfe_tbl_task.h
+151 −147 modules/tbl/fsw/src/cfe_tbl_task_cmds.c
+31 −29 modules/tbl/fsw/src/cfe_tbl_task_cmds.h
+227 −136 modules/time/fsw/src/cfe_time_api.c
+254 −306 modules/time/fsw/src/cfe_time_task.c
+132 −175 modules/time/fsw/src/cfe_time_tone.c
+196 −181 modules/time/fsw/src/cfe_time_utils.c
+456 −25 modules/time/fsw/src/cfe_time_utils.h

0 comments on commit 8f3f360

Please sign in to comment.