From af4ba7f7840b9d8ae2469115c8e11655e0f035d1 Mon Sep 17 00:00:00 2001 From: Niall Mullane Date: Tue, 22 Jun 2021 14:09:32 -0400 Subject: [PATCH 1/2] Fix #272, Apply fix for Osal guide pdf generation --- .github/workflows/build-documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 696e05b6a..28fed1410 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -221,7 +221,7 @@ jobs: if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} run: | mkdir deploy - cd ./build/docs/osalguide/latex + cd ./build/docs/osalguide/apiguide/latex make > build.txt mv refman.pdf $GITHUB_WORKSPACE/deploy/OSAL_Users_Guide.pdf # Could add pandoc and convert to github markdown From 1afe0e98b88358d89b33dbd965ee355147765386 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Mon, 21 Jun 2021 15:13:42 -0400 Subject: [PATCH 2/2] IC:2021-06-22, cfe, osal, and coding standard *Combines* - nasa/cFE#1632, v6.8.0-rc1+dev726 - nasa/osal#1079, v5.1.0-rc1+dev548 - nasa/ci_lab#88, v2.4.0-rc1+dev42 - nasa/sch_lab#83, v2.4.0-rc1+dev40 - nasa/sample_app#150, v1.2.0-rc1+dev66 - nasa/sample_lib#64, v1.2.0-rc1+dev38 - nasa/to_lab#100, v2.4.0-rc1+dev49 - nasa/elf2cfetbl#81, v3.2.0-rc1+dev30 - nasa/tblCRCTool#52, v1.2.0-rc1+dev33 - nasa/cFS-GroundSystem#183, v2.2.0-rc1+dev52 *Includes* - nasa/cfe#1630, correct path to users guide warning log - nasa/cfe#1621, add additional test cases for Child Tasks - nasa/cfe#1608, Add cfe functional tests to CI - nasa/cfe#1627, rename/clean CFE coverage assert macros - nasa/cfe#1623, Added UT tests for cFE ES Api - nasa/cfe#1634, Expand CDS Functional Tests. - nasa/cfe#1633, add test log file - nasa/cfe#1594, Event ID updates - nasa/cFE#1624, scrub all UT_Report calls - nasa/osal#1066, implement missing parameter/retcode test permutations - nasa/cFS-GroundSystem#182, Add test start command script for cmdUtil - nasa/tblCRCTool#51, add printf conversion casts ** Implement Coding Standard in CodeQL ** - nasa/cFS-GroundSystem#180 - nasa/elf2cfetbl#80 - nasa/tblCRCTool#49 - nasa/ci_lab#87 - nasa/sch_lab#79 - nasa/sample_app#149 - nasa/sample_lib#63 - nasa/to_lab#99 Co-authored-by: Jacob Hageman Co-authored-by: Joseph Hickey Co-authored-by: Ariel Adams Co-authored-by: Alex Campbell Co-authored-by: Jose F Martinez Pedraza --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sample_lib | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- tools/tblCRCTool | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index 306216728..ba565d960 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 30621672863e99bf2d43488e566d60784bb4e715 +Subproject commit ba565d9604cd11fa6a9a7171adbea56d9f28b11b diff --git a/apps/sample_app b/apps/sample_app index 1c32ed48c..a8cdbc89a 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 1c32ed48ca358a3fdd55f1bdc9ae0dda61a4f4f7 +Subproject commit a8cdbc89a1ec0ebc3aef7cf5b8598b9bc7306f5a diff --git a/apps/sample_lib b/apps/sample_lib index 12c82b585..828f35337 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit 12c82b58595fe92dad2f110bf1996dc6832c52b9 +Subproject commit 828f353377de204e61e903dd95ca21b0f4f244a8 diff --git a/apps/sch_lab b/apps/sch_lab index 80c7197f8..dd6e0be2e 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit 80c7197f84c582934b4f9de071bf332cfb8867ab +Subproject commit dd6e0be2e8b3d356d2dcf29d8a44c65cf772b2bc diff --git a/apps/to_lab b/apps/to_lab index 17e4fccf6..5a4f767b6 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 17e4fccf6658a82af01e7b6a03fdca48cfd8c81a +Subproject commit 5a4f767b611378312ef262771ad1d52150db5594 diff --git a/cfe b/cfe index d03e24e67..9d4fcaed5 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit d03e24e675fcd253222e40a5c544920e03854c5f +Subproject commit 9d4fcaed503f243683d144b30a003583d8f4f217 diff --git a/osal b/osal index a3b7012ee..64a6b31b5 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit a3b7012ee09a6c2fdbd3506a861b1fa9908d9f49 +Subproject commit 64a6b31b5448a6301c64b001e043d4c7d9570131 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 24f625b66..12e26ce5a 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 24f625b6610f1f2461244111b6e973b63a710dbe +Subproject commit 12e26ce5a8a8733bcecd4e1a3cc0234466f02f9f diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 858a176f0..3eeae683c 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 858a176f05db108bc985613309481214df076e95 +Subproject commit 3eeae683cca418322077e89bea587cb3f1159354 diff --git a/tools/tblCRCTool b/tools/tblCRCTool index 9761ab512..86c54bbe1 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit 9761ab51264ee6bff859a2e3a7adace67fa27328 +Subproject commit 86c54bbe12a53a5076abe580b232c6cd431fa5fe