diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index e844f14..5be211a 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -1,10 +1,10 @@ - name: Jekyll site CI on: + push: pull_request: - branches: [ master, main ] - + branches: [ main, master ] + workflow_dispatch: permissions: contents: read @@ -14,7 +14,6 @@ permissions: jobs: build: runs-on: ubuntu-latest - steps: - name: Checkout uses: actions/checkout@v3 @@ -44,6 +43,28 @@ jobs: PAGES_REPO_NWO: ${{ github.repository }} JEKYLL_ENV: ${{ steps.name.outputs.jekyll_env }} JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JEKYLL_BUILD_BRANCH: ${{ github.ref_name }} + JEKYLL_BASE_PATH: ${{ steps.pages.outputs.base_path }} - name: Upload artifact - uses: actions/upload-pages-artifact@v1 \ No newline at end of file + uses: actions/upload-pages-artifact@v1 + + deploy: + runs-on: ubuntu-latest + needs: build + + if: | + github.event_name == 'workflow_dispatch' || + (github.event_name == 'push' && github.event.repository.default_branch == github.ref_name) + concurrency: + group: "pages" + cancel-in-progress: true + + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v1