Merge pull request nasa#461 from nasa/integration-candidate

cFS Bundle Integration candidate: Caelum-rc4+dev8
skliper · Apr 19, 2022 · a5acaef · a5acaef
2 parents 2c4ef5c + 06f5ce8
commit a5acaef
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
diff --git a/osal b/osal
diff --git a/psp b/psp