Merge pull request #248 from nasa/integration-candidate

cFS bundle Integration candidate: 2021-04-20
nasa · Apr 22, 2021 · a4787c2 · a4787c2
2 parents 397c6b1 + 8872aec
commit a4787c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -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
@@ -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
@@ -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/[email protected]
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -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
@@ -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
@@ -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/[email protected]
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
+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
+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