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 a6c6b65a4..81416f8f3 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit a6c6b65a43fceb623bbac5bfc305c68b03317982 +Subproject commit 81416f8f3552c2b0f85e820f4f423f62f8aee634 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