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-08-10 #333

Merged
merged 5 commits into from
Aug 11, 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
8 changes: 4 additions & 4 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,10 @@ jobs:
key: usersguide-buildnum-${{ github.run_number }}

deploy-usersguide:
needs: build-usersguide
# Name the Job
name: Deploy Users Guide
# Set the type of machine to run on
runs-on: ubuntu-18.04
needs: build-usersguide
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}

steps:
- name: Cache cFS Build Environment for usersguide
Expand Down Expand Up @@ -258,6 +257,7 @@ jobs:
needs: build-osalguide
name: Deploy Osal Guide
runs-on: ubuntu-18.04
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}

steps:
- name: Cache cFS Build Environment for osalguide
Expand All @@ -268,11 +268,11 @@ jobs:
key: osalguide-buildnum-${{ github.run_number }}

- name: Deploy to GitHub
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
uses: JamesIves/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: deploy
CLEAN: false
SINGLE_COMMIT: true

4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ This project and everyone participating in it is governed by the [cFS Code of Co

### Discussions and Questions

For questions or help, submit a GitHub issue, [join the cfs community mailing list](README.md#join-the-mailing-list).
For discussions, questions, or ideas, [start a new discussion](https://github.com/nasa/cFS/discussions/new) in the cFS repository under the Discussions tab.

[Join the cfs community mailing list](README.md#join-the-mailing-list).


### Report Bugs
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ See related repositories for current open issues.

## Getting Help

For best results, submit issues:questions or issues:help wanted requests to this repo.
### Discussions

You can [start a new discussion](https://github.com/nasa/cFS/discussions/new) for discussions, questions, or ideas, in the cFS repository under the Discussions tab.

### Join the mailing list

Expand All @@ -86,7 +87,6 @@ If you'd like to unsubscribe, send an email with the word *unsubscribe* to cfs-c

You can email the cFS Product Team at [email protected] to explore partnerships and other arrangements for in-depth support.


## Setup

Ensure the following software are installed: Make, CMake, GCC, and Git. To setup the cFS BUNDLE directly from the latest set of interoperable repositories:
Expand Down
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 49 files
+24 −8 README.md
+1 −1 modules/cfe_assert/src/cfe_assert_init.c
+1 −1 modules/cfe_assert/src/cfe_assert_priv.h
+1 −1 modules/cfe_assert/src/cfe_assert_runner.c
+14 −1 modules/cfe_testcase/CMakeLists.txt
+46 −0 modules/cfe_testcase/inc/cfe_test_tbl.h
+16 −0 modules/cfe_testcase/src/cfe_test.c
+22 −4 modules/cfe_testcase/src/cfe_test.h
+49 −0 modules/cfe_testcase/src/cfe_test_table.c
+45 −0 modules/cfe_testcase/src/cfe_test_table.h
+62 −0 modules/cfe_testcase/src/es_application_control_test.c
+1 −1 modules/cfe_testcase/src/es_cds_test.c
+166 −0 modules/cfe_testcase/src/es_counter_test.c
+1 −1 modules/cfe_testcase/src/es_mempool_test.c
+7 −0 modules/cfe_testcase/src/es_misc_test.c
+105 −0 modules/cfe_testcase/src/es_resource_id_test.c
+27 −27 modules/cfe_testcase/src/es_task_test.c
+54 −0 modules/cfe_testcase/src/evs_filters_test.c
+7 −7 modules/cfe_testcase/src/fs_header_test.c
+0 −3 modules/cfe_testcase/src/fs_util_test.c
+1 −1 modules/cfe_testcase/src/sb_pipe_mang_test.c
+167 −0 modules/cfe_testcase/src/tbl_content_access_test.c
+132 −0 modules/cfe_testcase/src/tbl_content_mang_test.c
+96 −0 modules/cfe_testcase/src/tbl_information_test.c
+138 −0 modules/cfe_testcase/src/tbl_registration_test.c
+1 −1 modules/cfe_testcase/src/time_current_test.c
+58 −0 modules/cfe_testcase/src/time_misc_test.c
+36 −0 modules/cfe_testcase/tables/cfe_test_tbl.c
+13 −12 modules/core_api/fsw/inc/cfe_es.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+18 −214 modules/core_private/ut-stubs/inc/ut_support.h
+1 −1 modules/core_private/ut-stubs/src/cfe_es_core_internal_handlers.c
+1 −1 modules/core_private/ut-stubs/src/cfe_fs_core_internal_handlers.c
+5 −272 modules/core_private/ut-stubs/src/ut_support.c
+63 −63 modules/es/ut-coverage/es_UT.c
+5 −5 modules/evs/ut-coverage/evs_UT.c
+24 −25 modules/fs/ut-coverage/fs_UT.c
+7 −7 modules/msg/ut-coverage/test_cfe_msg_ccsdspri.c
+7 −7 modules/msg/ut-coverage/test_cfe_msg_checksum.c
+1 −1 modules/msg/ut-coverage/test_cfe_msg_init.c
+2 −2 modules/msg/ut-coverage/test_cfe_msg_msgid_v1.c
+1 −1 modules/msg/ut-coverage/test_msg_utils.h
+1 −1 modules/resourceid/fsw/src/cfe_resourceid_api.c
+30 −30 modules/sb/ut-coverage/sb_UT.c
+2 −2 modules/sbr/ut-coverage/test_cfe_sbr_map_direct.c
+1 −1 modules/sbr/ut-coverage/test_cfe_sbr_map_hash.c
+6 −6 modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c
+8 −8 modules/tbl/ut-coverage/tbl_UT.c
+10 −10 modules/time/ut-coverage/time_UT.c
2 changes: 1 addition & 1 deletion osal