From c0b2e8840aaed1e4be31fa5aab49b84d1c0ce914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Arko?= <andre@arko.net>
Date: Tue, 2 Apr 2024 16:58:02 -0700
Subject: [PATCH] Upgrade to Jekyll 4 (#185)
* 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
---
.github/workflows/build.yml | 67 +++++++--
.ruby-version | 1 +
Gemfile | 20 +--
Gemfile.lock | 283 ++++++-----------------------------
Rakefile | 2 +-
bin/jekyll | 27 ++++
stylesheets/scss/_post.scss | 2 +
stylesheets/scss/base.scss | 2 +
stylesheets/scss/layout.scss | 2 +
stylesheets/scss/type.scss | 2 +
10 files changed, 148 insertions(+), 260 deletions(-)
create mode 100644 .ruby-version
create mode 100755 bin/jekyll
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1df597e..15d100f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..15a27998
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+3.3.0
diff --git a/Gemfile b/Gemfile
index 97da1cdd..471018c6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"
diff --git a/Gemfile.lock b/Gemfile.lock
index 26684819..982270bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,285 +7,98 @@ GIT
listen (>= 1.3)
rack (>= 1.5)
-GIT
- remote: https://github.com/envygeeks/pathutil.git
- revision: 3451a10c362fc867b20c7e471a551b31c40a0246
- ref: refs/pull/5/head
- specs:
- pathutil (0.16.2)
- forwardable-extended (~> 2.6)
-
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.0.7.2)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 1.6, < 2)
- minitest (>= 5.1)
- tzinfo (~> 2.0)
- addressable (2.8.1)
+ addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
- coffee-script (2.4.1)
- coffee-script-source
- execjs
- coffee-script-source (1.11.1)
+ base64 (0.2.0)
+ bigdecimal (3.1.7)
colorator (1.1.0)
- commonmarker (0.23.10)
- concurrent-ruby (1.2.2)
- dnsruby (1.61.9)
- simpleidn (~> 0.1)
+ concurrent-ruby (1.2.3)
+ csv (3.3.0)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
- ethon (0.16.0)
- ffi (>= 1.15.0)
eventmachine (1.2.7)
- execjs (2.8.1)
- faraday (2.7.4)
- faraday-net_http (>= 2.0, < 3.1)
- ruby2_keywords (>= 0.0.4)
- faraday-net_http (3.0.2)
- ffi (1.15.5)
+ ffi (1.16.3)
forwardable-extended (2.6.0)
- gemoji (3.0.1)
- github-pages (228)
- github-pages-health-check (= 1.17.9)
- jekyll (= 3.9.3)
- jekyll-avatar (= 0.7.0)
- jekyll-coffeescript (= 1.1.1)
- jekyll-commonmark-ghpages (= 0.4.0)
- jekyll-default-layout (= 0.1.4)
- jekyll-feed (= 0.15.1)
- jekyll-gist (= 1.5.0)
- jekyll-github-metadata (= 2.13.0)
- jekyll-include-cache (= 0.2.1)
- jekyll-mentions (= 1.6.0)
- jekyll-optional-front-matter (= 0.3.2)
- jekyll-paginate (= 1.1.0)
- jekyll-readme-index (= 0.3.0)
- jekyll-redirect-from (= 0.16.0)
- jekyll-relative-links (= 0.6.1)
- jekyll-remote-theme (= 0.4.3)
- jekyll-sass-converter (= 1.5.2)
- jekyll-seo-tag (= 2.8.0)
- jekyll-sitemap (= 1.4.0)
- jekyll-swiss (= 1.0.0)
- jekyll-theme-architect (= 0.2.0)
- jekyll-theme-cayman (= 0.2.0)
- jekyll-theme-dinky (= 0.2.0)
- jekyll-theme-hacker (= 0.2.0)
- jekyll-theme-leap-day (= 0.2.0)
- jekyll-theme-merlot (= 0.2.0)
- jekyll-theme-midnight (= 0.2.0)
- jekyll-theme-minimal (= 0.2.0)
- jekyll-theme-modernist (= 0.2.0)
- jekyll-theme-primer (= 0.6.0)
- jekyll-theme-slate (= 0.2.0)
- jekyll-theme-tactile (= 0.2.0)
- jekyll-theme-time-machine (= 0.2.0)
- jekyll-titles-from-headings (= 0.5.3)
- jemoji (= 0.12.0)
- kramdown (= 2.3.2)
- kramdown-parser-gfm (= 1.1.0)
- liquid (= 4.0.4)
- mercenary (~> 0.3)
- minima (= 2.5.1)
- nokogiri (>= 1.13.6, < 2.0)
- rouge (= 3.26.0)
- terminal-table (~> 1.4)
- github-pages-health-check (1.17.9)
- addressable (~> 2.3)
- dnsruby (~> 1.60)
- octokit (~> 4.0)
- public_suffix (>= 3.0, < 5.0)
- typhoeus (~> 1.3)
- html-pipeline (2.14.3)
- activesupport (>= 2)
- nokogiri (>= 1.4)
+ google-protobuf (4.26.1)
+ rake (>= 13)
http_parser.rb (0.8.0)
- i18n (1.14.1)
+ i18n (1.14.4)
concurrent-ruby (~> 1.0)
- jekyll (3.9.3)
+ jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (>= 0.7, < 2)
- jekyll-sass-converter (~> 1.0)
+ i18n (~> 1.0)
+ jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
- kramdown (>= 1.17, < 3)
+ kramdown (~> 2.3, >= 2.3.1)
+ kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
- mercenary (~> 0.3.3)
+ mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
+ rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
- jekyll-avatar (0.7.0)
- jekyll (>= 3.0, < 5.0)
- jekyll-coffeescript (1.1.1)
- coffee-script (~> 2.2)
- coffee-script-source (~> 1.11.1)
- jekyll-commonmark (1.4.0)
- commonmarker (~> 0.22)
- jekyll-commonmark-ghpages (0.4.0)
- commonmarker (~> 0.23.7)
- jekyll (~> 3.9.0)
- jekyll-commonmark (~> 1.4.0)
- rouge (>= 2.0, < 5.0)
- jekyll-default-layout (0.1.4)
- jekyll (~> 3.0)
- jekyll-feed (0.15.1)
- jekyll (>= 3.7, < 5.0)
- jekyll-gist (1.5.0)
- octokit (~> 4.2)
- jekyll-github-metadata (2.13.0)
- jekyll (>= 3.4, < 5.0)
- octokit (~> 4.0, != 4.4.0)
- jekyll-include-cache (0.2.1)
- jekyll (>= 3.7, < 5.0)
- jekyll-mentions (1.6.0)
- html-pipeline (~> 2.3)
- jekyll (>= 3.7, < 5.0)
- jekyll-optional-front-matter (0.3.2)
- jekyll (>= 3.0, < 5.0)
- jekyll-paginate (1.1.0)
- jekyll-readme-index (0.3.0)
- jekyll (>= 3.0, < 5.0)
- jekyll-redirect-from (0.16.0)
- jekyll (>= 3.3, < 5.0)
- jekyll-relative-links (0.6.1)
- jekyll (>= 3.3, < 5.0)
- jekyll-remote-theme (0.4.3)
- addressable (~> 2.0)
- jekyll (>= 3.5, < 5.0)
- jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
- rubyzip (>= 1.3.0, < 3.0)
- jekyll-sass-converter (1.5.2)
- sass (~> 3.4)
- jekyll-seo-tag (2.8.0)
- jekyll (>= 3.8, < 5.0)
- jekyll-sitemap (1.4.0)
- jekyll (>= 3.7, < 5.0)
- jekyll-swiss (1.0.0)
- jekyll-theme-architect (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-cayman (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-dinky (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-hacker (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-leap-day (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-merlot (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-midnight (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-minimal (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-modernist (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-primer (0.6.0)
- jekyll (> 3.5, < 5.0)
- jekyll-github-metadata (~> 2.9)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-slate (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-tactile (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-time-machine (0.2.0)
- jekyll (> 3.5, < 5.0)
- jekyll-seo-tag (~> 2.0)
- jekyll-titles-from-headings (0.5.3)
- jekyll (>= 3.3, < 5.0)
+ terminal-table (>= 1.8, < 4.0)
+ webrick (~> 1.7)
+ jekyll-sass-converter (3.0.0)
+ sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
- jemoji (0.12.0)
- gemoji (~> 3.0)
- html-pipeline (~> 2.2)
- jekyll (>= 3.0, < 5.0)
- kramdown (2.3.2)
+ kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
- listen (3.8.0)
+ listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
- mercenary (0.3.6)
- mini_portile2 (2.8.5)
- minima (2.5.1)
- jekyll (>= 3.5, < 5.0)
- jekyll-feed (~> 0.9)
- jekyll-seo-tag (~> 2.1)
- minitest (5.19.0)
- nio4r (2.7.0)
- nokogiri (1.16.2)
- mini_portile2 (~> 2.8.2)
- racc (~> 1.4)
- octokit (4.25.1)
- faraday (>= 1, < 3)
- sawyer (~> 0.9)
- public_suffix (4.0.7)
- puma (5.6.8)
+ mercenary (0.4.0)
+ nio4r (2.7.1)
+ pathutil (0.16.2)
+ forwardable-extended (~> 2.6)
+ public_suffix (5.0.5)
+ puma (6.4.2)
nio4r (~> 2.0)
- racc (1.7.3)
- rack (2.2.8.1)
- rake (13.0.3)
+ rack (3.0.10)
+ rake (13.2.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
- rexml (3.2.5)
- rouge (3.26.0)
- ruby2_keywords (0.0.5)
- rubyzip (2.3.2)
+ rexml (3.2.6)
+ rouge (4.2.1)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
+ sass-embedded (1.72.0)
+ google-protobuf (>= 3.25, < 5.0)
+ rake (>= 13.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- sawyer (0.9.2)
- addressable (>= 2.3.5)
- faraday (>= 0.17.3, < 3)
- simpleidn (0.2.1)
- unf (~> 0.1.4)
- terminal-table (1.8.0)
- unicode-display_width (~> 1.1, >= 1.1.1)
- typhoeus (1.4.0)
- ethon (>= 0.9.0)
- tzinfo (2.0.6)
- concurrent-ruby (~> 1.0)
- unf (0.1.4)
- unf_ext
- unf_ext (0.0.8.2)
- unicode-display_width (1.8.0)
- webrick (1.7.0)
+ terminal-table (3.0.2)
+ unicode-display_width (>= 1.1.1, < 3)
+ unicode-display_width (2.5.0)
+ webrick (1.8.1)
PLATFORMS
ruby
DEPENDENCIES
- github-pages
- pathutil!
- puma (~> 5.6)
- rack (< 3)
+ base64 (~> 0.2.0)
+ bigdecimal (~> 3.1)
+ csv (~> 3.3)
+ jekyll (~> 4.0)
+ puma (~> 6.0)
rack-jekyll (~> 0.5.0)!
- rake
- sass
- webrick
+ rake (~> 13.0)
+ sass (~> 3.7)
RUBY VERSION
- ruby 3.0.5p211
+ ruby 3.3.0p0
BUNDLED WITH
- 2.4.4
+ 2.5.7
diff --git a/Rakefile b/Rakefile
index 4f67d256..15333d60 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,7 @@ desc "compile and run the site"
task :default do
pids = [
spawn("bundle exec jekyll serve --watch"),
- spawn("bundle exec scss --quiet --watch stylesheets/scss:stylesheets"),
+ spawn("bundle exec scss --quiet --watch stylesheets/scss:_site/stylesheets"),
]
trap "INT" do
diff --git a/bin/jekyll b/bin/jekyll
new file mode 100755
index 00000000..d2e20b59
--- /dev/null
+++ b/bin/jekyll
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'jekyll' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("jekyll", "jekyll")
diff --git a/stylesheets/scss/_post.scss b/stylesheets/scss/_post.scss
index 39d58d41..95bae212 100644
--- a/stylesheets/scss/_post.scss
+++ b/stylesheets/scss/_post.scss
@@ -1,3 +1,5 @@
+@import "load";
+
article {
background: #fff;
border-radius: 3px;
diff --git a/stylesheets/scss/base.scss b/stylesheets/scss/base.scss
index 5caf0d6d..22b0f5d5 100644
--- a/stylesheets/scss/base.scss
+++ b/stylesheets/scss/base.scss
@@ -1,3 +1,5 @@
+@import "load";
+
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
diff --git a/stylesheets/scss/layout.scss b/stylesheets/scss/layout.scss
index 23cec608..14133d77 100644
--- a/stylesheets/scss/layout.scss
+++ b/stylesheets/scss/layout.scss
@@ -1,3 +1,5 @@
+@import "load";
+
.l-relative {
position: relative;
}
diff --git a/stylesheets/scss/type.scss b/stylesheets/scss/type.scss
index 32a57fd9..828d3f34 100644
--- a/stylesheets/scss/type.scss
+++ b/stylesheets/scss/type.scss
@@ -1,3 +1,5 @@
+@import "load";
+
.t-display {
font: {
family: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;