From 8ceddd5f0f33a014a2bda0274d35ee436e24cedb Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Mon, 18 Apr 2022 18:06:19 -0400 Subject: [PATCH 1/2] IC: Caelum-rc4+dev8 **Combines** nasa/cFE#2091 v7.0.0-rc4+dev110 **Includes** *cFE* nasa/cFE#2077, Remove contributor license agreement nasa/cFE#2085, Use reusable documentation generation workflow nasa/cFE#2080, Add config module to coverage enforcemnt nasa/cFE#2081, Improve ES unit test coverage nasa/cFE#2082, Only increment SB InternalErrorCounter on errors *osal* nasa/osal#1246, Apply latest contributor license agreement links *PSP* nasa/PSP#331, Apply latest contributor license agreement links nasa/PSP#334, Fix input to static analysis workflow Co-authored-by: Jacob Hageman Co-authored-by: Justing Figueroa --- cfe | 2 +- osal | 2 +- psp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfe b/cfe index a6c6b65a4..145e15b25 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit a6c6b65a43fceb623bbac5bfc305c68b03317982 +Subproject commit 145e15b25692d5dccde43553ef27a1adcff40da4 diff --git a/osal b/osal index 88f72d788..4c08633c9 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 88f72d788d33a12e7bf9d9f01c77346438730ffa +Subproject commit 4c08633c9f2b29e68ab26ca85e169070952c63ea diff --git a/psp b/psp index e3d28d85a..62bf885d6 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit e3d28d85a49c849c79f83e7414be65a318a8f834 +Subproject commit 62bf885d6d94b714002fae8be2f0134077bba59e From 06f5ce8eabddf7a3005242f55019f9a6daa9c939 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:51:27 -0400 Subject: [PATCH 2/2] HotFix #455, Resolve invalid workflow error for build-documentation.yml - Remove "checkout" option from build-documentation.yml in both cFS bundle and cFE repos. - Change do_not_skip to pull_request - Make job names more descriptive --- .github/workflows/build-deploy-doc.yml | 2 +- .github/workflows/build-documentation.yml | 7 +++---- cfe | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index 60bef824b..d4b00b9c8 100644 --- a/.github/workflows/build-deploy-doc.yml +++ b/.github/workflows/build-deploy-doc.yml @@ -44,7 +44,7 @@ jobs: with: concurrent_skipping: 'same_content' skip_after_successful_duplicate: 'true' - do_not_skip: '["push", "workflow_dispatch", "schedule"]' + do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]' build-doc: needs: checks-for-duplicates diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 242f27516..149149e50 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -18,7 +18,7 @@ jobs: with: concurrent_skipping: 'same_content' skip_after_successful_duplicate: 'true' - do_not_skip: '["push", "workflow_dispatch", "schedule"]' + do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]' checkout-and-cache: name: Custom checkout and cache for cFS documents @@ -41,12 +41,11 @@ jobs: build-cfs-documentation: needs: checkout-and-cache - name: Build and deploy cFS documents + name: Build cFS documents uses: nasa/cFS/.github/workflows/build-deploy-doc.yml@main with: target: "[\"cfe-usersguide\", \"osal-apiguide\", \"mission-doc\"]" - cache-key: cfs-doc-${{ github.run_number }} - checkout: false + cache-key: cfs-doc-${{ github.run_number }} deploy: false deploy-documentation: diff --git a/cfe b/cfe index 145e15b25..81416f8f3 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 145e15b25692d5dccde43553ef27a1adcff40da4 +Subproject commit 81416f8f3552c2b0f85e820f4f423f62f8aee634