From 3ea174c9f23258eaba3b66070f5c11ed34db4c4d Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 24 May 2025 15:18:55 +0100 Subject: [PATCH 1/4] Fix build on rolling release distros --- Gemfile | 5 ++- Gemfile.lock | 94 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index 7c89b40..cacfd96 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,15 @@ source "https://rubygems.org" gem "jekyll" -gem "webrick" +gem "webrick", "~> 1.7" gem "json" +gem "sassc", "2.1" +gem "bigdecimal" group :jekyll_plugins do gem "jekyll-feed" gem "jekyll-paginate" gem "jekyll-sitemap" gem "jekyll-redirect-from" + gem "jekyll-sass-converter", "~> 2.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 6437842..b468610 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,52 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + bigdecimal (3.1.9) colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.5) + csv (3.3.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.17.1) + 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-linux-gnu) + ffi (1.17.1-x86-linux-musl) + 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) http_parser.rb (0.8.0) - i18n (1.10.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + json (~> 2.6) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) - jekyll-feed (0.16.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) jekyll-redirect-from (0.16.0) @@ -40,43 +57,60 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.7.1) - kramdown (2.4.0) - rexml + json (2.10.1) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.7) - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + public_suffix (6.0.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.28.0) + rexml (3.4.1) + rouge (4.5.1) safe_yaml (1.0.5) - sassc (2.4.0) + sassc (2.1.0) ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.8.0) - webrick (1.7.0) + sassc (2.1.0-x86-linux) + ffi (~> 1.9) + sassc (2.1.0-x86_64-linux) + ffi (~> 1.9) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.6.0) + webrick (1.9.1) PLATFORMS - x86_64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES + bigdecimal jekyll jekyll-feed jekyll-paginate jekyll-redirect-from + jekyll-sass-converter (~> 2.0) jekyll-sitemap json - webrick + sassc (= 2.1) + webrick (~> 1.7) BUNDLED WITH - 2.3.10 + 2.6.0 From ff6bd8f999f01f86263ce2fd049d078e6e2ed357 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 24 May 2025 15:20:25 +0100 Subject: [PATCH 2/4] Indentation --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index cacfd96..01fbf5b 100644 --- a/Gemfile +++ b/Gemfile @@ -11,5 +11,5 @@ group :jekyll_plugins do gem "jekyll-paginate" gem "jekyll-sitemap" gem "jekyll-redirect-from" - gem "jekyll-sass-converter", "~> 2.0" + gem "jekyll-sass-converter", "~> 2.0" end From 87a79b4a82861f60710e574d3c83716795691372 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 24 May 2025 19:13:04 +0100 Subject: [PATCH 3/4] Add logger --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 01fbf5b..a509e5f 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ gem "webrick", "~> 1.7" gem "json" gem "sassc", "2.1" gem "bigdecimal" +gem "logger" group :jekyll_plugins do gem "jekyll-feed" From 032b936312e27b8f6449160879ef377f44767fe1 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 24 May 2025 19:15:47 +0100 Subject: [PATCH 4/4] Update lock file --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index b468610..e3ae1ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,6 +66,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -109,6 +110,7 @@ DEPENDENCIES jekyll-sass-converter (~> 2.0) jekyll-sitemap json + logger sassc (= 2.1) webrick (~> 1.7)