diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index bbf6aa0..01518d1 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -7,9 +7,10 @@ name: Deploy Jekyll site to Pages on: - # Runs on pushes targeting the default branch + # Runs on pushes targeting the default branch and pull requests push: branches: ["main"] + pull_request: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -52,8 +53,9 @@ jobs: # Automatically uploads an artifact from the './_site' directory by default uses: actions/upload-pages-artifact@v3 - # Deployment job + # Deployment job (only if triggered by push to main) deploy: + if: github.event_name == 'push' && github.ref == 'refs/heads/main' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} diff --git a/Gemfile.lock b/Gemfile.lock index 6a1576f..107e1f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,14 +45,8 @@ GEM logger faraday-net_http (3.4.0) net-http (>= 0.5.0) - ffi (1.17.1-aarch64-linux-gnu) - ffi (1.17.1-aarch64-linux-musl) - ffi (1.17.1-arm-linux-gnu) - ffi (1.17.1-arm-linux-musl) ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86_64-darwin) ffi (1.17.1-x86_64-linux-gnu) - ffi (1.17.1-x86_64-linux-musl) forwardable-extended (2.6.0) gemoji (4.1.0) github-pages (232) @@ -241,22 +235,10 @@ GEM minitest (5.25.4) net-http (0.6.0) uri - nokogiri (1.18.3-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-musl) - racc (~> 1.4) nokogiri (1.18.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.3-x86_64-darwin) - racc (~> 1.4) nokogiri (1.18.3-x86_64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-musl) - racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -292,14 +274,8 @@ GEM webrick (1.9.1) PLATFORMS - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-gnu - arm-linux-musl arm64-darwin - x86_64-darwin - x86_64-linux-gnu - x86_64-linux-musl + x86_64-linux DEPENDENCIES github-pages (~> 232)