another book round (#1933)

This commit is contained in:
James Hodgkinson 2023-08-02 20:27:46 +10:00 committed by GitHub
parent 4292f94ecd
commit 6e755543b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,8 +59,6 @@ jobs:
uses: './.github/workflows/kanidm_individual_book.yml' uses: './.github/workflows/kanidm_individual_book.yml'
needs: pre_deploy needs: pre_deploy
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
# if: ${{ github.action_ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm' }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -85,7 +83,7 @@ jobs:
- docs_master - docs_master
runs-on: ubuntu-latest runs-on: ubuntu-latest
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
if: ${{ github.action_ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm' && github.event == 'merge' }} if: ${{ github.action_ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm' }}
steps: steps:
- name: Setup Pages - name: Setup Pages
uses: actions/configure-pages@v3 uses: actions/configure-pages@v3
@ -134,4 +132,4 @@ jobs:
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v2 uses: actions/deploy-pages@v2
if: ${{ github.ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm' }} if: github.event.pull_request.merged == true