Merge pull request #466 from skliper/fix465-doc_deploy_fixes

Fix #465 #463, CI document deployment fixes
nasa · Apr 25, 2022 · 753ed54 · 753ed54
2 parents 325bf9e + 18a764b
commit 753ed54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml
@@ -48,7 +48,7 @@ jobs:
 
   build-doc:
     needs: checks-for-duplicates
-    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
+    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }}
     name: Build Documentation
     runs-on: ubuntu-18.04
 
@@ -58,6 +58,12 @@ jobs:
         target: ${{ fromJson(inputs.target) }}
 
     steps:
+      - name: Reject non-compatible deployment settings
+        if: ${{ inputs.deploy == true && inputs.cache-key != '' }}
+        run: |
+          echo "Deployment when using cache not supported due to password fail issue"
+          exit -1
+
       - name: Get cache if supplied
         id: cache-src-bld
         if: ${{ inputs.cache-key != '' }}

diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -23,7 +23,7 @@ jobs:
   checkout-and-cache:
     name: Custom checkout and cache for cFS documents
     needs: checks-for-duplicates
-    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
+    if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }}
     runs-on: ubuntu-latest
 
     steps:
@@ -50,7 +50,7 @@ jobs:
 
   deploy-documentation:
     needs: build-cfs-documentation
-    if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+    if: ${{ github.event_name == 'push' && contains(github.ref, 'main') }}
     name: Deploy documentation to gh-pages
     runs-on: ubuntu-latest