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.

Sign up for GitHub

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

Jump to bottom

cFS bundle Integration candidate: 2021-04-20 #248

Merged
merged 3 commits into from
Apr 22, 2021
Merged

cFS bundle Integration candidate: 2021-04-20 #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
151bab9
IC:2021-04-20, Add context check to docs deploy step
astrogeco Apr 22, 2021
8efa7c9
IC:2021-04-20, Check for duplicates for all jobs in docs workflow
astrogeco Apr 22, 2021
8872aec
IC:2021-04-20, Update cFE, osal, cFS-GroundSystem
astrogeco Apr 22, 2021
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
16 changes: 10 additions & 6 deletions .github/workflows/build-documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ jobs:

build-usersguide:
# Name the Job
needs: checks-for-duplicates
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
name: Users Guide
# Set the type of machine to run on
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -127,12 +129,12 @@ jobs:
fi

- name: PDF generation installs
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
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' }}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
run: |
set -x
mkdir deploy
Expand All @@ -143,7 +145,7 @@ jobs:
# pandoc CFE_Users_Guide.pdf -t gfm

- name: Deploy
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -154,6 +156,8 @@ jobs:

build-osalguide:
# Name the Job
needs: checks-for-duplicates
if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
name: Osal Guide
# Set the type of machine to run on
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -210,12 +214,12 @@ jobs:
fi

- name: PDF generation installs
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
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' }}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
run: |
mkdir deploy
cd ./build/doc/osalguide/latex
Expand All @@ -225,7 +229,7 @@ jobs:
# pandoc CFE_Users_Guide.pdf -t gfm

- name: Deploy
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion cfe
Open in desktop
Submodule cfe updated 25 files
+8 −0 README.md
+3 −2 cmake/arch_build.cmake
+2 −8 cmake/mission_build.cmake
+20 −6 cmake/mission_defaults.cmake
+6 −5 cmake/sample_defs/cpu1_cfe_es_startup.scr
+3 −1 cmake/target/CMakeLists.txt
+11 −13 docs/README_functionaltest.md
+1 −0 modules/cfe_assert/CMakeLists.txt
+30 −3 modules/cfe_assert/inc/cfe_assert.h
+12 −1 modules/cfe_assert/src/cfe_assert_init.c
+0 −2 modules/cfe_assert/src/cfe_assert_io.c
+54 −0 modules/cfe_assert/src/cfe_assert_priv.h
+92 −38 modules/cfe_assert/src/cfe_assert_runner.c
+4 −4 modules/cfe_testcase/CMakeLists.txt
+25 −4 modules/cfe_testcase/src/cfe_test.c
+2 −2 modules/cfe_testcase/src/cfe_test.h
+18 −16 modules/cfe_testcase/src/es_info_test.c
+0 −13 modules/cfe_testrunner/CMakeLists.txt
+0 −65 modules/cfe_testrunner/inc/cfe_testrunner.h
+3 −8 modules/core_api/CMakeLists.txt
+7 −1 modules/core_api/fsw/inc/cfe_es.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+3 −3 modules/core_api/ut-stubs/CMakeLists.txt
+1 −1 modules/core_private/CMakeLists.txt
+3 −3 modules/core_private/ut-stubs/CMakeLists.txt
2 changes: 1 addition & 1 deletion osal
Open in desktop
Submodule osal updated 15 files
+6 −0 README.md
+8 −8 src/os/inc/osapi-file.h
+1 −1 src/os/inc/osapi-version.h
+5 −5 src/os/portable/os-impl-posix-files.c
+7 −7 src/os/portable/os-impl-posix-gettime.c
+3 −2 src/os/posix/src/os-impl-shell.c
+4 −9 src/os/rtems/CMakeLists.txt
+0 −85 src/os/rtems/src/os-impl-shell.c
+3 −3 src/os/shared/inc/os-shared-file.h
+5 −5 src/os/shared/src/osapi-file.c
+2 −2 src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+2 −2 src/unit-test-coverage/shared/src/coveragetest-file.c
+4 −3 src/unit-test-coverage/ut-stubs/src/osapi-file-impl-stubs.c
+3 −34 src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+4 −4 src/ut-stubs/osapi-utstub-file.c
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
Open in desktop
Submodule cFS-GroundSystem updated 3 files
+9 −0 Guide-GroundSystem.md
+7 −0 README.md
+4 −3 setup.py