Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #465 #463, CI document deployment fixes #466

Merged
merged 2 commits into from
Apr 25, 2022
Merged

Fix #465 #463, CI document deployment fixes #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8391462
Fix #463, Remove doc deploy skip for main branch actions
skliper Apr 21, 2022
18a764b
Fix #465, Reject CI doc deployment request if using cache
skliper Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build-deploy-doc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 != '' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down