From 038484980714e02678a5fa115b592fa31066b6d7 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 6 Mar 2025 18:08:27 +0000 Subject: [PATCH 1/2] Update middleman --- Gemfile | 3 ++ Gemfile.lock | 146 +++++++++++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 64 deletions(-) diff --git a/Gemfile b/Gemfile index 886d7be40..634d43dd4 100644 --- a/Gemfile +++ b/Gemfile @@ -20,3 +20,6 @@ gem "rack-contrib" # For try_static # For testing purposes gem "nokogiri" gem "httparty" + +# For Ruby > 3.4.x +gem "csv" diff --git a/Gemfile.lock b/Gemfile.lock index cd9846462..c1d962350 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,24 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.6) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (8.0.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - backports (3.23.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) bourbon (4.2.2) sass (~> 3.4) thor @@ -18,75 +27,80 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) - contracts (0.13.0) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + contracts (0.17.2) + csv (3.3.2) docile (1.4.0) - dotenv (2.7.6) + dotenv (3.1.7) + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) - erubis (2.7.0) + erubi (1.13.1) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.10.0) fast_blank (1.0.1) - fastimage (2.2.6) + fastimage (2.4.0) favicon_maker (1.3.1) docile (~> 1.1) - ffi (1.17.0) - haml (5.2.2) - temple (>= 0.8.0) + ffi (1.17.1) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt hamster (3.0.0) concurrent-ruby (~> 1.0) - hashie (3.6.0) + hashie (5.0.0) http_parser.rb (0.8.0) httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (1.6.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - kramdown (2.4.0) - rexml - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + kramdown (2.5.1) + rexml (>= 3.3.9) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.6) memoist (0.16.2) - middleman (4.4.2) - coffee-script (~> 2.2) - haml (>= 4.0.5) - kramdown (>= 2.3.0) - middleman-cli (= 4.4.2) - middleman-core (= 4.4.2) + middleman (4.6.0) + middleman-cli (= 4.6.0) + middleman-core (= 4.6.0) middleman-blog (4.0.3) addressable (~> 2.3) middleman-core (>= 4.0.0) tzinfo (>= 0.3.0) - middleman-cli (4.4.2) - thor (>= 0.17.0, < 2.0) - middleman-core (4.4.2) - activesupport (>= 6.1, < 7.0) + middleman-cli (4.6.0) + thor (>= 0.17.0, < 1.3.0) + middleman-core (4.6.0) + activesupport (>= 6.1) addressable (~> 2.4) - backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13.0) + coffee-script (~> 2.2) + contracts dotenv - erubis + erubi execjs (~> 2.0) fast_blank fastimage (~> 2.0) + haml (>= 4.0.5) hamster (~> 3.0) - hashie (~> 3.4) - i18n (~> 1.6.0) - listen (~> 3.0.0) + hashie (>= 3.4, < 6.0) + i18n (>= 1.6, < 1.15) + kramdown (~> 2.4) + listen (~> 3.0) memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel - rack (>= 1.4.5, < 3) + rack (>= 3) + rackup sassc (~> 2.0) servolux - tilt (~> 2.0.9) + tilt (~> 2.2) toml - uglifier (~> 3.0) + uglifier (>= 3, < 5) webrick middleman-favicon-maker (4.1.0) favicon_maker (~> 1.3, >= 1.3.1) @@ -95,12 +109,12 @@ GEM em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-syntax (3.2.0) + middleman-syntax (3.4.0) middleman-core (>= 3.2) rouge (~> 3.2) mini_mime (1.1.2) mini_portile2 (2.8.6) - minitest (5.19.0) + minitest (5.25.4) multi_xml (0.6.0) neat (1.7.2) bourbon (>= 4.0) @@ -108,26 +122,28 @@ GEM nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - padrino-helpers (0.15.1) + padrino-helpers (0.15.3) i18n (>= 0.6.7, < 2) - padrino-support (= 0.15.1) + padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) - padrino-support (0.15.1) - parallel (1.22.1) + padrino-support (0.15.3) + parallel (1.26.3) parslet (2.0.0) - public_suffix (4.0.7) + public_suffix (6.0.1) racc (1.7.3) - rack (2.2.9) + rack (3.1.11) rack-contrib (2.5.0) rack (< 4) rack-livereload (0.3.17) rack - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rackup (2.2.1) + rack (>= 3) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.0) - rexml (3.3.9) - rouge (3.28.0) + rexml (3.4.1) + rouge (3.30.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -135,21 +151,22 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) + securerandom (0.4.1) servolux (0.13.0) - slim (4.1.0) - temple (>= 0.7.6, < 0.9) - tilt (>= 2.0.6, < 2.1) - temple (0.8.2) - thor (1.2.1) - tilt (2.0.10) + slim (5.2.1) + temple (~> 0.10.0) + tilt (>= 2.1.0) + temple (0.10.3) + thor (1.2.2) + tilt (2.6.0) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uglifier (3.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - webrick (1.8.2) - zeitwerk (2.6.11) + uri (1.0.3) + webrick (1.9.1) PLATFORMS ruby @@ -157,6 +174,7 @@ PLATFORMS DEPENDENCIES bourbon (= 4.2.2) builder (~> 3.0) + csv httparty middleman (~> 4.3) middleman-blog @@ -171,4 +189,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.3.3 + 2.6.2 From fa2c18d5faf2c124034fb0d08b80da5c47bc545b Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Fri, 7 Mar 2025 08:52:16 +0000 Subject: [PATCH 2/2] Manually install imagemagick --- .github/workflows/build.yml | 1 + .github/workflows/middleman_deploy.yml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81882198b..332cc81d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,6 +34,7 @@ jobs: ruby-version: '3.3' - name: Install dependencies run: | + sudo apt-get install imagemagick bundle config set --local path '.bundle/gems' bundle install - name: Build with Middleman diff --git a/.github/workflows/middleman_deploy.yml b/.github/workflows/middleman_deploy.yml index a6dc31193..8c1a171b7 100644 --- a/.github/workflows/middleman_deploy.yml +++ b/.github/workflows/middleman_deploy.yml @@ -48,7 +48,10 @@ jobs: key: ${{ runner.os }}-source-build path: __source_build - name: Install dependencies - run: bundle install + run: | + sudo apt-get install imagemagick + bundle config set --local path '.bundle/gems' + bundle install - name: Build with Middleman run: | mkdir -p __source_build