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-02-02 #182

Merged
merged 5 commits into from
Feb 16, 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
54 changes: 54 additions & 0 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jobs:
uses: actions/checkout@v2
with:
submodules: true
persist-credentials: false

# Setup the build system
- name: Copy Files
Expand Down Expand Up @@ -112,6 +113,32 @@ jobs:
exit -1
fi

- name: PDF generation installs
if: ${{ github.event_name == 'push' }}
run: |
sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra

- name: PDF generation
if: ${{ github.event_name == 'push' }}
run: |
set -x
mkdir deploy
cd ./build/doc/users_guide/latex
make > build.txt
mv refman.pdf $GITHUB_WORKSPACE/deploy/cFE_Users_Guide.pdf
# Could add pandoc and convert to github markdown
# pandoc CFE_Users_Guide.pdf -t gfm

- name: Deploy
if: ${{ github.event_name == 'push' }}
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: deploy
CLEAN: false
SINGLE_COMMIT: true

build-osalguide:
# Name the Job
name: Osal Guide
Expand All @@ -124,6 +151,7 @@ jobs:
uses: actions/checkout@v2
with:
submodules: true
persist-credentials: false

# Setup the build system
- name: Copy Files
Expand Down Expand Up @@ -167,3 +195,29 @@ jobs:
cat osalguide_warnings.log
exit -1
fi

- name: PDF generation installs
if: ${{ github.event_name == 'push' }}
run: |
sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra

- name: PDF generation
if: ${{ github.event_name == 'push' }}
run: |
mkdir deploy
cd ./build/doc/osalguide/latex
make > build.txt
mv refman.pdf $GITHUB_WORKSPACE/deploy/OSAL_Users_Guide.pdf
# Could add pandoc and convert to github markdown
# pandoc CFE_Users_Guide.pdf -t gfm

- name: Deploy
if: ${{ github.event_name == 'push' }}
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: deploy
CLEAN: false
SINGLE_COMMIT: true

26 changes: 11 additions & 15 deletions .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,27 @@ on:
pull_request:
branches:
- main

env:
SIMULATION: native
ENABLE_UNIT_TESTS: true
OMIT_DEPRECATED: true
BUILDTYPE: release

jobs:

CodeQL-Build:

strategy:
matrix:
buildtype: [debug, release]

runs-on: ubuntu-18.04
timeout-minutes: 15
env:
BUILDTYPE: ${{ matrix.buildtype }}

steps:
# Checks out a copy of your repository on the ubuntu-latest machine
# Checks out a copy of your repository
- name: Checkout code
uses: actions/checkout@v2
with:
repository: nasa/cFS
submodules: true

- name: Check versions
run: |
git log -1 --pretty=oneline
Expand All @@ -38,8 +34,8 @@ jobs:
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: c
config-file: ./.github/codeql/codeql-config.yml
languages: c
config-file: ./.github/codeql/codeql-config.yml

# Setup the build system
- name: Copy sample_defs
Expand All @@ -49,8 +45,8 @@ jobs:

# Setup the build system
- name: Make Install
run: make
# Run CodeQL
run: make

# Run CodeQL
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 99 files
+56 −0 .github/workflows/codeql-build.yml
+1 −0 .github/workflows/static-analysis.yml
+29 −1 README.md
+1 −1 cmake/arch_build.cmake
+1 −0 cmake/mission_defaults.cmake
+16 −50 cmake/sample_defs/cpu1_platform_cfg.h
+15 −9 docs/src/cfe_es.dox
+7 −10 docs/src/cfe_sb.dox
+2 −36 docs/src/cfe_tbl.dox
+107 −95 fsw/cfe-core/src/es/cfe_es_api.c
+64 −76 fsw/cfe-core/src/es/cfe_es_apps.c
+12 −23 fsw/cfe-core/src/es/cfe_es_apps.h
+1 −1 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+17 −17 fsw/cfe-core/src/es/cfe_es_cds.c
+16 −16 fsw/cfe-core/src/es/cfe_es_cds.h
+3 −3 fsw/cfe-core/src/es/cfe_es_erlog.c
+6 −6 fsw/cfe-core/src/es/cfe_es_global.h
+1 −1 fsw/cfe-core/src/es/cfe_es_log.h
+18 −18 fsw/cfe-core/src/es/cfe_es_mempool.c
+9 −9 fsw/cfe-core/src/es/cfe_es_mempool.h
+0 −13 fsw/cfe-core/src/es/cfe_es_objtab.c
+28 −83 fsw/cfe-core/src/es/cfe_es_resource.c
+95 −42 fsw/cfe-core/src/es/cfe_es_resource.h
+10 −10 fsw/cfe-core/src/es/cfe_es_start.c
+22 −19 fsw/cfe-core/src/es/cfe_es_task.c
+0 −3 fsw/cfe-core/src/es/cfe_es_task.h
+10 −8 fsw/cfe-core/src/evs/cfe_evs.c
+39 −39 fsw/cfe-core/src/evs/cfe_evs_log.c
+65 −75 fsw/cfe-core/src/evs/cfe_evs_task.c
+5 −6 fsw/cfe-core/src/evs/cfe_evs_task.h
+19 −19 fsw/cfe-core/src/evs/cfe_evs_utils.c
+9 −9 fsw/cfe-core/src/evs/cfe_evs_utils.h
+2 −2 fsw/cfe-core/src/fs/cfe_fs_api.c
+10 −8 fsw/cfe-core/src/fs/cfe_fs_priv.c
+2 −2 fsw/cfe-core/src/fs/cfe_fs_priv.h
+84 −39 fsw/cfe-core/src/inc/cfe_es.h
+24 −13 fsw/cfe-core/src/inc/cfe_es_extern_typedefs.h
+19 −10 fsw/cfe-core/src/inc/cfe_es_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_evs.h
+12 −18 fsw/cfe-core/src/inc/cfe_evs_events.h
+1 −1 fsw/cfe-core/src/inc/cfe_evs_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
+0 −150 fsw/cfe-core/src/inc/cfe_resourceid.h
+257 −0 fsw/cfe-core/src/inc/cfe_resourceid_api.h
+14 −13 fsw/cfe-core/src/inc/cfe_sb.h
+1 −1 fsw/cfe-core/src/inc/cfe_sb_events.h
+9 −0 fsw/cfe-core/src/inc/cfe_sb_extern_typedefs.h
+16 −29 fsw/cfe-core/src/inc/cfe_sb_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+97 −0 fsw/cfe-core/src/inc/private/cfe_core_resourceid_basevalues.h
+1 −1 fsw/cfe-core/src/inc/private/cfe_es_erlog_typedef.h
+1 −3 fsw/cfe-core/src/inc/private/cfe_es_resetdata_typedef.h
+5 −5 fsw/cfe-core/src/inc/private/cfe_private.h
+0 −165 fsw/cfe-core/src/inc/private/cfe_resourceid_internal.h
+174 −173 fsw/cfe-core/src/sb/cfe_sb_api.c
+16 −16 fsw/cfe-core/src/sb/cfe_sb_buf.c
+12 −14 fsw/cfe-core/src/sb/cfe_sb_init.c
+23 −23 fsw/cfe-core/src/sb/cfe_sb_priv.c
+30 −33 fsw/cfe-core/src/sb/cfe_sb_priv.h
+167 −202 fsw/cfe-core/src/sb/cfe_sb_task.c
+2 −6 fsw/cfe-core/src/sb/cfe_sb_verify.h
+99 −99 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+113 −182 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+6 −6 fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+18 −18 fsw/cfe-core/src/tbl/cfe_tbl_task.c
+4 −4 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+112 −112 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h
+15 −15 fsw/cfe-core/src/time/cfe_time_api.c
+68 −68 fsw/cfe-core/src/time/cfe_time_task.c
+139 −139 fsw/cfe-core/src/time/cfe_time_tone.c
+119 −175 fsw/cfe-core/src/time/cfe_time_utils.c
+7 −7 fsw/cfe-core/src/time/cfe_time_utils.h
+324 −252 fsw/cfe-core/unit-test/es_UT.c
+49 −49 fsw/cfe-core/unit-test/evs_UT.c
+187 −192 fsw/cfe-core/unit-test/sb_UT.c
+0 −16 fsw/cfe-core/unit-test/sb_UT.h
+393 −392 fsw/cfe-core/unit-test/tbl_UT.c
+410 −410 fsw/cfe-core/unit-test/time_UT.c
+8 −12 fsw/cfe-core/unit-test/ut_support.c
+1 −1 fsw/cfe-core/unit-test/ut_support.h
+1 −0 fsw/cfe-core/ut-stubs/CMakeLists.txt
+32 −77 fsw/cfe-core/ut-stubs/ut_es_stubs.c
+3 −3 fsw/cfe-core/ut-stubs/ut_evs_stubs.c
+121 −0 fsw/cfe-core/ut-stubs/ut_resourceid_stubs.c
+1 −11 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_time_stubs.c
+1 −1 modules/cfe_testcase/src/es_test.c
+18 −0 modules/resourceid/CMakeLists.txt
+13 −0 modules/resourceid/arch_build.cmake
+32 −0 modules/resourceid/mission_build.cmake
+79 −0 modules/resourceid/option/cfe_resourceid_osal_compatible.h
+64 −0 modules/resourceid/option/cfe_resourceid_simple.h
+87 −0 modules/resourceid/option/cfe_resourceid_strict.h
+134 −0 modules/resourceid/src/cfe_resourceid_api.c
+29 −0 modules/resourceid/unit-test-coverage/CMakeLists.txt
+181 −0 modules/resourceid/unit-test-coverage/test_cfe_resourceid.c
+11 −22 modules/sbr/src/cfe_sbr_route_unsorted.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 392 files
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 129 files