diff --git a/.github/workflows/kanidm_book.yml b/.github/workflows/kanidm_book.yml index 3ac8d2986..2e061a0ad 100644 --- a/.github/workflows/kanidm_book.yml +++ b/.github/workflows/kanidm_book.yml @@ -59,8 +59,6 @@ jobs: uses: './.github/workflows/kanidm_individual_book.yml' needs: pre_deploy # yamllint disable-line rule:line-length - # if: ${{ github.action_ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm' }} - strategy: fail-fast: false matrix: @@ -85,7 +83,7 @@ jobs: - docs_master runs-on: ubuntu-latest # 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: - name: Setup Pages uses: actions/configure-pages@v3 @@ -134,4 +132,4 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v2 - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm' }} + if: github.event.pull_request.merged == true \ No newline at end of file