From 946d3439fb3d8eb1558e436251adf441bec97024 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 16 Mar 2022 07:08:32 -0600 Subject: [PATCH 1/5] Fix #441, Update doc workflow OSAL directory --- .github/workflows/build-documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index e6f280883..94b0cce21 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -134,7 +134,7 @@ jobs: if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} run: | mkdir deploy - cd ./build/docs/osalguide/apiguide/latex + cd ./build/docs/osalguide/latex make > build.txt mv refman.pdf $GITHUB_WORKSPACE/deploy/OSAL_Users_Guide.pdf # Could add pandoc and convert to github markdown @@ -206,4 +206,4 @@ jobs: FOLDER: deploy CLEAN: false SINGLE_COMMIT: true - \ No newline at end of file + From ba6fe4c4b6c4f1c74b59eeef5c012e3e9c05a72d Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 16 Mar 2022 11:17:33 -0600 Subject: [PATCH 2/5] Fix #441, Add detaildesign warning check and fix usersguide warning check logic --- .github/workflows/build-documentation.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 94b0cce21..3bb64c35d 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -55,6 +55,8 @@ jobs: - name: Build Docs run: | make doc > make_doc_stdout.txt 2> make_doc_stderr.txt + mv build/docs/detaildesign-warnings.log detaildesign-warnings.log + # Upload documentation logs as artifacts - name: Archive Documentation Build Logs uses: actions/upload-artifact@v2 @@ -63,6 +65,8 @@ jobs: path: | make_doc_stdout.txt make_doc_stderr.txt + detaildesign-warnings.log + - name: Error Check run: | if [[ -s make_doc_stderr.txt ]]; then @@ -70,6 +74,13 @@ jobs: exit -1 fi + - name: Warning Check + run: | + if [[ -s detaildesign-warnings.log ]]; then + cat detaildesign-warnings.log + exit -1 + fi + build: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }} @@ -143,7 +154,8 @@ jobs: - name: Build Usersguide run: | make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt - + mv build/docs/users_guide/cfe-usersguide-warnings.log cfe-usersguide-warnings.log + - name: Archive Users Guide Build Logs uses: actions/upload-artifact@v2 with: From b5c7342a97b5f35fc1afdf7e358f275874de9e89 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 10 Mar 2022 16:37:19 -0500 Subject: [PATCH 3/5] nasa/osal#1221, Implement OS_ModuleGetInfo_Impl for RTEMS --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index a173f3081..22925f0a9 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit a173f3081497fa97d99956c868bcb59141620d7d +Subproject commit 22925f0a9b24bf04130333c3264dc89dcbd68770 From a2ae1ef632f3abc82b85d699a6904608e9e63f41 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 16 Mar 2022 15:25:08 -0400 Subject: [PATCH 4/5] Doxygen "main-page" for cFE and osal nasa/osal#1232, Expose osal common config nasa/cFE#2065, Resolve OSAL Doxygen refs with osal-common config --- cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfe b/cfe index 4438f72f7..848912c00 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 4438f72f733545e9542a358c3234602d5b78d905 +Subproject commit 848912c005f331e07e83d2ac8ad89444d3cf7be4 From fe39e27222b5955f5b9b85f1eadc9f4373915cc0 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 16 Mar 2022 18:02:47 -0400 Subject: [PATCH 5/5] IC: Caelum-rc4+dev6 Combines: nasa/cFE#2066, v7.0.0-rc4+dev87 nasa/osal#1233, v6.0.0-rc4+dev54 Co-authored-by: Jacob Hageman Co-authored-by: Justin Figueroa --- cfe | 2 +- osal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfe b/cfe index 848912c00..a39b0a65f 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 848912c005f331e07e83d2ac8ad89444d3cf7be4 +Subproject commit a39b0a65fb2724692469ff492484b523fb4fa7e6 diff --git a/osal b/osal index 22925f0a9..fafb045e7 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 22925f0a9b24bf04130333c3264dc89dcbd68770 +Subproject commit fafb045e7a5311e19affe0ddab724f1604e739f4