Skip to content

Commit

Permalink
Upgrade to Jekyll 4 (#185)
Browse files Browse the repository at this point in the history
* add jekyll binstub

* bump to ruby 3.3.0

* update pages action

* upgrade to jekyll 4

* build all pushes, deploy only default branch

* adjust conditional syntax

* update puma, add back rack-jekyll

* fix imports for new scss version

* send generated css to _site
  • Loading branch information
indirect authored Apr 2, 2024
1 parent a4a659d commit c0b2e88
Show file tree
Hide file tree
Showing 10 changed files with 148 additions and 260 deletions.
67 changes: 53 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,58 @@
name: Build
on:
pull_request:
push:
branches:
- master
# 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 site to Pages

on: [push, workflow_dispatch]

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
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.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
name: Build
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
- uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2
- name: Checkout
uses: actions/checkout@v4
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 3.0.5
- name: Build
run: bundle exec jekyll build
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 1 # Increment this number if you need to re-download cached gems
- name: Setup Pages
id: pages
uses: actions/configure-pages@v5
- name: Build with Jekyll
# 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
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
if: github.ref == 'refs/heads/master'
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.0
20 changes: 10 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://rubygems.org'
ruby '3.0.5'
source "https://rubygems.org"
ruby file: ".ruby-version"

gem 'github-pages'
gem 'pathutil', github: 'https://github.com/envygeeks/pathutil/pull/5'
gem 'webrick'
gem 'puma', '~> 5.6'
gem 'rack', '< 3'
gem 'rack-jekyll', '~> 0.5.0', github: 'adaoraul/rack-jekyll'
gem 'rake'
gem 'sass'
gem "base64", "~> 0.2.0"
gem "bigdecimal", "~> 3.1"
gem "csv", "~> 3.3"
gem "jekyll", "~> 4.0"
gem "puma", "~> 6.0"
gem "rack-jekyll", "~> 0.5.0", github: "adaoraul/rack-jekyll"
gem "rake", "~> 13.0"
gem "sass", "~> 3.7"
Loading

0 comments on commit c0b2e88

Please sign in to comment.