From 83914624ee04dd7ec6da63a2bc05878f689e6cf8 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 21 Apr 2022 12:18:21 -0600 Subject: [PATCH 1/2] Fix #463, Remove doc deploy skip for main branch actions --- .github/workflows/build-deploy-doc.yml | 2 +- .github/workflows/build-documentation.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index d4b00b9c8..620172ca7 100644 --- 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 diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 149149e50..c809413ea 100644 --- 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 From 18a764bdb5ee30bb8ab954f71b5d6dd8aa1b76bd Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 21 Apr 2022 12:22:22 -0600 Subject: [PATCH 2/2] Fix #465, Reject CI doc deployment request if using cache --- .github/workflows/build-deploy-doc.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index 620172ca7..acd672db8 100644 --- a/.github/workflows/build-deploy-doc.yml +++ b/.github/workflows/build-deploy-doc.yml @@ -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 != '' }}