diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f631cf..d53fb4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index eaa8fbd..f57c8e8 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -1,9 +1,14 @@ name: documentation -on: [push, pull_request, workflow_dispatch] +on: + pull_request: + push: + branches: + - main + workflow_dispatch: concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: @@ -27,7 +32,7 @@ jobs: id: extract_branch - name: Deploy to GitHub Pages (branch) uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }} + if: ${{ github.event_name != 'push' && github.ref != 'refs/heads/main' }} with: publish_branch: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }} @@ -35,9 +40,10 @@ jobs: destination_dir: branch/${{ steps.extract_branch.outputs.branch }} - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} + if: ${{ github.ref == 'refs/heads/main' }} with: publish_branch: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: docs/_build/html - destination_dir: / + destination_dir: ./ + keep_files: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5568d46..87b34e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: - published concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: