From 05b856e2422e465e3d201ec047242f308cc4af12 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 21:29:39 +0000
Subject: [PATCH 1/9] What about ruby 3.3

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 1effb00..eb39e53 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7
+3.3

From 9d3d6b769ed4cb54287c128b35e61bb65d6f2375 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 21:29:59 +0000
Subject: [PATCH 2/9] Bump github-pages

It's not ruby 3 compatible at all so we'll have to do something else.
---
 Gemfile.lock | 131 ++++++++++++++++++++++++---------------------------
 1 file changed, 61 insertions(+), 70 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0e8aa5a..d0f463f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,62 +1,52 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.6.1)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.0)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    dnsruby (1.70.0)
+      simpleidn (~> 0.2.1)
+    drb (2.2.0)
+      ruby2_keywords
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    ffi (1.15.5)
+    execjs (2.9.1)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (226)
+    github-pages (228)
       github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.2)
+      jekyll (= 3.9.3)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.2.0)
+      jekyll-commonmark-ghpages (= 0.4.0)
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
@@ -90,10 +80,10 @@ GEM
       jemoji (= 0.12.0)
       kramdown (= 2.3.2)
       kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
+      liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.4, < 2.0)
+      nokogiri (>= 1.13.6, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.17.9)
@@ -102,17 +92,17 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.1)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (3.9.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
       kramdown (>= 1.17, < 3)
@@ -128,11 +118,11 @@ GEM
       coffee-script-source (~> 1.11.1)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.2.0)
-      commonmarker (~> 0.23.4)
+    jekyll-commonmark-ghpages (0.4.0)
+      commonmarker (~> 0.23.7)
       jekyll (~> 3.9.0)
       jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 4.0)
+      rouge (>= 2.0, < 5.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
     jekyll-feed (0.15.1)
@@ -220,32 +210,34 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.1)
+    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.17.0)
-    multipart-post (2.1.1)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    minitest (5.22.0)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.2)
-    rb-fsevent (0.11.1)
+    racc (1.7.3)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (3.26.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -255,23 +247,22 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      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)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    zeitwerk (2.6.6)
+    uri (0.13.0)
 
 PLATFORMS
   ruby
@@ -280,4 +271,4 @@ DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   2.1.4
+   2.5.6

From a155c2da8490b6f5175d8622c904a2756efa9ead Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 21:32:00 +0000
Subject: [PATCH 3/9] Replace github-pages with jekyll directly

Ran `bundle exec github-pages versions --gemfile` to get this, should help us unpin from using github-pages directly.
---
 Gemfile      | 42 +++++++++++++++++++++++-
 Gemfile.lock | 90 ++++++++++++++++++++++++----------------------------
 2 files changed, 82 insertions(+), 50 deletions(-)

diff --git a/Gemfile b/Gemfile
index 83a45d5..1fedbb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,43 @@
 source "https://rubygems.org"
 
-gem "github-pages"
+gem 'jekyll', '3.9.3'
+gem 'jekyll-sass-converter', '1.5.2'
+gem 'kramdown', '2.3.2'
+gem 'kramdown-parser-gfm', '1.1.0'
+gem 'jekyll-commonmark-ghpages', '0.4.0'
+gem 'liquid', '4.0.4'
+gem 'rouge', '3.26.0'
+gem 'github-pages-health-check', '1.17.9'
+gem 'jekyll-redirect-from', '0.16.0'
+gem 'jekyll-sitemap', '1.4.0'
+gem 'jekyll-feed', '0.15.1'
+gem 'jekyll-gist', '1.5.0'
+gem 'jekyll-paginate', '1.1.0'
+gem 'jekyll-coffeescript', '1.1.1'
+gem 'jekyll-seo-tag', '2.8.0'
+gem 'jekyll-github-metadata', '2.13.0'
+gem 'jekyll-avatar', '0.7.0'
+gem 'jekyll-remote-theme', '0.4.3'
+gem 'jekyll-include-cache', '0.2.1'
+gem 'jemoji', '0.12.0'
+gem 'jekyll-mentions', '1.6.0'
+gem 'jekyll-relative-links', '0.6.1'
+gem 'jekyll-optional-front-matter', '0.3.2'
+gem 'jekyll-readme-index', '0.3.0'
+gem 'jekyll-default-layout', '0.1.4'
+gem 'jekyll-titles-from-headings', '0.5.3'
+gem 'minima', '2.5.1'
+gem 'jekyll-swiss', '1.0.0'
+gem 'jekyll-theme-primer', '0.6.0'
+gem 'jekyll-theme-architect', '0.2.0'
+gem 'jekyll-theme-cayman', '0.2.0'
+gem 'jekyll-theme-dinky', '0.2.0'
+gem 'jekyll-theme-hacker', '0.2.0'
+gem 'jekyll-theme-leap-day', '0.2.0'
+gem 'jekyll-theme-merlot', '0.2.0'
+gem 'jekyll-theme-midnight', '0.2.0'
+gem 'jekyll-theme-minimal', '0.2.0'
+gem 'jekyll-theme-modernist', '0.2.0'
+gem 'jekyll-theme-slate', '0.2.0'
+gem 'jekyll-theme-tactile', '0.2.0'
+gem 'jekyll-theme-time-machine', '0.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d0f463f..cb6b2dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,51 +41,6 @@ GEM
     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)
@@ -252,8 +207,6 @@ GEM
       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.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
@@ -261,14 +214,53 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
-    unicode-display_width (1.8.0)
     uri (0.13.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  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)
+  minima (= 2.5.1)
+  rouge (= 3.26.0)
 
 BUNDLED WITH
    2.5.6

From 18d2291ad5a0f3e4930b8eeddf4fcb67607ebf95 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 22:05:46 +0000
Subject: [PATCH 4/9] Update to jekyll 4

We filtered out a bunch of explicit versions of jekyll plugins that were blocking the upgrade, but also, got rid if we weren't using them.
---
 Gemfile      |  80 ++++++++++++-----------
 Gemfile.lock | 178 ++++++++++++---------------------------------------
 _config.yml  |   4 +-
 3 files changed, 84 insertions(+), 178 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1fedbb3..0dff5f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,43 +1,45 @@
 source "https://rubygems.org"
 
-gem 'jekyll', '3.9.3'
-gem 'jekyll-sass-converter', '1.5.2'
-gem 'kramdown', '2.3.2'
-gem 'kramdown-parser-gfm', '1.1.0'
-gem 'jekyll-commonmark-ghpages', '0.4.0'
-gem 'liquid', '4.0.4'
-gem 'rouge', '3.26.0'
-gem 'github-pages-health-check', '1.17.9'
-gem 'jekyll-redirect-from', '0.16.0'
-gem 'jekyll-sitemap', '1.4.0'
-gem 'jekyll-feed', '0.15.1'
-gem 'jekyll-gist', '1.5.0'
-gem 'jekyll-paginate', '1.1.0'
-gem 'jekyll-coffeescript', '1.1.1'
+gem 'jekyll', '~>4.3'
+gem 'jekyll-sass-converter' #, '1.5.2'
+#gem 'kramdown', '2.3.2'
+#gem 'kramdown-parser-gfm', '1.1.0'
+gem 'jekyll-commonmark'
+gem 'liquid' #, '4.0.4'
+gem 'rouge' #, '3.26.0'
+gem 'github-pages-health-check' #, '1.17.9'
+# gem 'jekyll-redirect-from', '0.16.0'
+gem 'jekyll-sitemap' #, '1.4.0'
+# gem 'jekyll-feed', '0.15.1'
+# gem 'jekyll-gist', '1.5.0'
+# gem 'jekyll-paginate', '1.1.0'
+# gem 'jekyll-coffeescript', '1.1.1'
 gem 'jekyll-seo-tag', '2.8.0'
-gem 'jekyll-github-metadata', '2.13.0'
-gem 'jekyll-avatar', '0.7.0'
-gem 'jekyll-remote-theme', '0.4.3'
-gem 'jekyll-include-cache', '0.2.1'
-gem 'jemoji', '0.12.0'
-gem 'jekyll-mentions', '1.6.0'
-gem 'jekyll-relative-links', '0.6.1'
-gem 'jekyll-optional-front-matter', '0.3.2'
-gem 'jekyll-readme-index', '0.3.0'
-gem 'jekyll-default-layout', '0.1.4'
-gem 'jekyll-titles-from-headings', '0.5.3'
+# gem 'jekyll-github-metadata', '2.13.0'
+# gem 'jekyll-avatar', '0.7.0'
+# gem 'jekyll-remote-theme', '0.4.3'
+# gem 'jekyll-include-cache', '0.2.1'
+gem 'jemoji' #, '0.12.0'
+# gem 'jekyll-mentions', '1.6.0'
+gem 'jekyll-relative-links' #, '0.6.1'
+gem 'jekyll-optional-front-matter' #, '0.3.2'
+# gem 'jekyll-readme-index', '0.3.0'
+gem 'jekyll-default-layout' #, '0.1.4'
+gem 'jekyll-titles-from-headings' #, '0.5.3'
 gem 'minima', '2.5.1'
-gem 'jekyll-swiss', '1.0.0'
-gem 'jekyll-theme-primer', '0.6.0'
-gem 'jekyll-theme-architect', '0.2.0'
-gem 'jekyll-theme-cayman', '0.2.0'
-gem 'jekyll-theme-dinky', '0.2.0'
-gem 'jekyll-theme-hacker', '0.2.0'
-gem 'jekyll-theme-leap-day', '0.2.0'
-gem 'jekyll-theme-merlot', '0.2.0'
-gem 'jekyll-theme-midnight', '0.2.0'
-gem 'jekyll-theme-minimal', '0.2.0'
-gem 'jekyll-theme-modernist', '0.2.0'
-gem 'jekyll-theme-slate', '0.2.0'
-gem 'jekyll-theme-tactile', '0.2.0'
-gem 'jekyll-theme-time-machine', '0.2.0'
+# gem 'jekyll-swiss', '1.0.0'
+# gem 'jekyll-theme-primer', '0.6.0'
+# gem 'jekyll-theme-architect', '0.2.0'
+# gem 'jekyll-theme-cayman', '0.2.0'
+# gem 'jekyll-theme-dinky', '0.2.0'
+# gem 'jekyll-theme-hacker', '0.2.0'
+# gem 'jekyll-theme-leap-day', '0.2.0'
+# gem 'jekyll-theme-merlot', '0.2.0'
+# gem 'jekyll-theme-midnight', '0.2.0'
+# gem 'jekyll-theme-minimal', '0.2.0'
+# gem 'jekyll-theme-modernist', '0.2.0'
+# gem 'jekyll-theme-slate', '0.2.0'
+# gem 'jekyll-theme-tactile', '0.2.0'
+# gem 'jekyll-theme-time-machine', '0.2.0'
+gem 'google-protobuf'
+gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index cb6b2dd..0f7db53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,6 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
     bigdecimal (3.1.6)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.3)
@@ -33,7 +29,6 @@ GEM
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.9.1)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
@@ -47,112 +42,45 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
+    google-protobuf (3.25.2)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       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)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     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-default-layout (0.1.5)
+      jekyll (>= 3.0, < 5.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-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     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)
     jekyll-watch (2.2.1)
@@ -161,7 +89,7 @@ GEM
       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)
@@ -169,8 +97,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.8.5)
+    mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
@@ -179,8 +106,7 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.2)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -189,24 +115,23 @@ GEM
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
     racc (1.7.3)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.6)
-    rouge (3.26.0)
+    rouge (4.2.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-embedded (1.70.0-x86_64-darwin)
+      google-protobuf (~> 3.25)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
@@ -214,53 +139,30 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
+    unicode-display_width (2.5.0)
     uri (0.13.0)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-22
 
 DEPENDENCIES
-  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)
+  github-pages-health-check
+  google-protobuf
+  jekyll (~> 4.3)
+  jekyll-commonmark
+  jekyll-default-layout
+  jekyll-optional-front-matter
+  jekyll-relative-links
+  jekyll-sass-converter
   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)
+  jekyll-sitemap
+  jekyll-titles-from-headings
+  jemoji
+  liquid
   minima (= 2.5.1)
-  rouge (= 3.26.0)
+  rake
+  rouge
 
 BUNDLED WITH
    2.5.6
diff --git a/_config.yml b/_config.yml
index 10f83d8..07ebefe 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,3 +1,5 @@
 timezone: Europe/London
 encoding: utf8
-markdown: kramdown
\ No newline at end of file
+markdown: kramdown
+# plugins:
+#   - jekyll-seo-tag

From c411a7da28baf94bce70242d7b86cff0f896d895 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 22:26:34 +0000
Subject: [PATCH 5/9] Add git sha / build revision into layout

Why?  Just to tell if what's served is fresh or not.
---
 Gemfile               | 2 +-
 Gemfile.lock          | 4 ++++
 _config.yml           | 5 +++--
 _layouts/default.html | 7 ++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0dff5f6..815dd20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'jekyll-sitemap' #, '1.4.0'
 # gem 'jekyll-paginate', '1.1.0'
 # gem 'jekyll-coffeescript', '1.1.1'
 gem 'jekyll-seo-tag', '2.8.0'
-# gem 'jekyll-github-metadata', '2.13.0'
+gem 'jekyll-github-metadata' #, '2.13.0'
 # gem 'jekyll-avatar', '0.7.0'
 # gem 'jekyll-remote-theme', '0.4.3'
 # gem 'jekyll-include-cache', '0.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f7db53..c034f2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,6 +71,9 @@ GEM
       jekyll (>= 3.0, < 5.0)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
+    jekyll-github-metadata (2.16.1)
+      jekyll (>= 3.4, < 5.0)
+      octokit (>= 4, < 7, != 4.4.0)
     jekyll-optional-front-matter (0.3.2)
       jekyll (>= 3.0, < 5.0)
     jekyll-relative-links (0.6.1)
@@ -152,6 +155,7 @@ DEPENDENCIES
   jekyll (~> 4.3)
   jekyll-commonmark
   jekyll-default-layout
+  jekyll-github-metadata
   jekyll-optional-front-matter
   jekyll-relative-links
   jekyll-sass-converter
diff --git a/_config.yml b/_config.yml
index 07ebefe..350ba97 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,6 @@
 timezone: Europe/London
 encoding: utf8
 markdown: kramdown
-# plugins:
-#   - jekyll-seo-tag
+plugins:
+  - "jekyll-github-metadata"
+repository: lrug/lrug.github.io
diff --git a/_layouts/default.html b/_layouts/default.html
index 280dff7..ae9f7aa 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>{{ title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    
+
     <link rel="stylesheet" type="text/css" href="https://lrug.org/styles.css" />
     <style>
       /* Temporary overrides */
@@ -15,9 +15,10 @@
         padding: 20px;
       }
     </style>
-    
+
     <link rel="shortcut icon" href="https://assets.lrug.org/favicon.ico" />
-    <link rel="icon" href="https://assets.lrug.org/favicon.ico" /> 
+    <link rel="icon" href="https://assets.lrug.org/favicon.ico" />
+    <meta name="build-revision" content="{{ site.github.build_revision }}">
   </head>
   <body id="page">
     <div id="content">{{ content }}</div>

From a5d46e608af8558ac9efdb8ec460a1c88f84b85b Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 22:47:08 +0000
Subject: [PATCH 6/9] Add SEO tag

Because why not?  Can't hurt.
---
 _config.yml           | 12 ++++++++++++
 _layouts/default.html |  1 +
 2 files changed, 13 insertions(+)

diff --git a/_config.yml b/_config.yml
index 350ba97..846d2c1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,4 +3,16 @@ encoding: utf8
 markdown: kramdown
 plugins:
   - "jekyll-github-metadata"
+  - "jekyll-seo-tag"
 repository: lrug/lrug.github.io
+social:
+  name: El Rug
+  links:
+    - https://ruby.social/@lrug
+    - https://github.com/lrug
+    - https://twitter.com/lrug
+logo: "https://assets.lrug.org/images/el-rug-logo.svg"
+locale: en_GB
+url: "https://readme.lrug.org/"
+title: README.lrug
+timezone: Europe/London
diff --git a/_layouts/default.html b/_layouts/default.html
index ae9f7aa..51e8026 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -19,6 +19,7 @@
     <link rel="shortcut icon" href="https://assets.lrug.org/favicon.ico" />
     <link rel="icon" href="https://assets.lrug.org/favicon.ico" />
     <meta name="build-revision" content="{{ site.github.build_revision }}">
+    {% seo %}
   </head>
   <body id="page">
     <div id="content">{{ content }}</div>

From 5571b72c9084a1ad50bc8ba02342a1b4d5148f57 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 22:52:18 +0000
Subject: [PATCH 7/9] Add github workflow to deploy jeykll to pages

Now we're not using the github-pages gem we have to do this "manually".  There's advice in https://jekyllrb.com/docs/continuous-integration/github-actions/ on how to do it, and this is the actions file we'd get if we followed those "click about int he UI" instructions.
---
 .github/workflows/jekyll-github-pages.yml | 60 +++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 .github/workflows/jekyll-github-pages.yml

diff --git a/.github/workflows/jekyll-github-pages.yml b/.github/workflows/jekyll-github-pages.yml
new file mode 100644
index 0000000..ac7f5e8
--- /dev/null
+++ b/.github/workflows/jekyll-github-pages.yml
@@ -0,0 +1,60 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+#
+# From: https://github.com/actions/starter-workflows/blob/main/pages/jekyll.yml
+name: Deploy Jekyll site to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: [ruby-3]
+
+  # Allows you to run this workflow manually from the Actions tab
+  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:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v4
+      - 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
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

From a1b25d8dbc14b8f82cdc3897252f5448f5ab4945 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 22:55:47 +0000
Subject: [PATCH 8/9] Add linux platform to the gemfile

Apparently bundler puts specific platforms in gemfiles now?  Almost certainly we didn't want this, but I'll work it out later.

This was prompted by the first attempt to build the site via actions failing.
---
 Gemfile.lock | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index c034f2d..6b46136 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,6 +111,8 @@ GEM
       uri
     nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-linux)
+      racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
@@ -128,6 +130,8 @@ GEM
     safe_yaml (1.0.5)
     sass-embedded (1.70.0-x86_64-darwin)
       google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86_64-linux-gnu)
+      google-protobuf (~> 3.25)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -148,6 +152,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   github-pages-health-check

From 4496fade936f7a331498ece01be2fba005f589b9 Mon Sep 17 00:00:00 2001
From: Murray Steele <muz@h-lame.com>
Date: Wed, 7 Feb 2024 23:04:57 +0000
Subject: [PATCH 9/9] Restrict deploys to the `main` branch

---
 .github/workflows/jekyll-github-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/jekyll-github-pages.yml b/.github/workflows/jekyll-github-pages.yml
index ac7f5e8..c0240f7 100644
--- a/.github/workflows/jekyll-github-pages.yml
+++ b/.github/workflows/jekyll-github-pages.yml
@@ -6,7 +6,7 @@ name: Deploy Jekyll site to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: [ruby-3]
+    branches: [main]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch: