From c6511b4add235c4306dce40711279212bbe6dde1 Mon Sep 17 00:00:00 2001 From: mselensky Date: Wed, 22 May 2024 19:45:33 -0600 Subject: [PATCH] jtd template --- .github/workflows/jekyll-gh-pages.yml | 39 +++++++++++++-------------- Gemfile | 3 ++- Gemfile.lock | 2 ++ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index 12dac79..61937d4 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -1,8 +1,12 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + # Sample workflow for building and deploying a Jekyll site to GitHub Pages -name: Deploy Jekyll with GitHub Pages dependencies preinstalled +name: Deploy Jekyll site to Pages on: - # Runs on pushes targeting the default branch push: branches: ["gh-pages"] @@ -15,11 +19,10 @@ permissions: pages: write id-token: write -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +# Allow one concurrent deployment concurrency: group: "pages" - cancel-in-progress: false + cancel-in-progress: true jobs: # Build job @@ -27,30 +30,24 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 - #- name: Setup Ruby - # uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 - # with: - # ruby-version: '3.1' # Not needed with a .ruby-version file - # bundler-cache: true # runs 'bundle install' and caches installed gems automatically - # cache-version: 0 # Increment this number if you need to re-download cached gems - - uses: ruby/setup-ruby@v1 + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 with: ruby-version: '3.3' # Not needed with a .ruby-version file bundler-cache: true # runs 'bundle install' and caches installed gems automatically -# - run: bundle exec rake + cache-version: 0 # Increment this number if you need to re-download cached gems - name: Setup Pages + id: pages uses: actions/configure-pages@v3 - name: Build with Jekyll - #run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" - uses: actions/jekyll-build-pages@v1 - with: - source: ./ - destination: ./_site + # Outputs to the './_site' directory by default + run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" env: JEKYLL_ENV: production - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + # Automatically uploads an artifact from the './_site' directory by default + uses: actions/upload-pages-artifact@v1 # Deployment job deploy: @@ -62,4 +59,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v2 diff --git a/Gemfile b/Gemfile index 86e1da2..4160a00 100644 --- a/Gemfile +++ b/Gemfile @@ -37,4 +37,5 @@ install_if -> { ENV["GITHUB_ACTIONS"] != "true" } do puts "Is GitHub action: #{ENV["GITHUB_ACTIONS"] == "true"}" gem "rake", "~> 13.2.1" end - + +gem "webrick" diff --git a/Gemfile.lock b/Gemfile.lock index 1f87f6a..f84045f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,6 +265,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (1.8.0) uri (0.13.0) + webrick (1.8.1) PLATFORMS arm64-darwin-23 @@ -279,6 +280,7 @@ DEPENDENCIES tzinfo (>= 1, < 3) tzinfo-data wdm (~> 0.1.1) + webrick BUNDLED WITH 2.4.13