From f5a53a9e5966cf3d57269b8dd6c90a0b2eea495a Mon Sep 17 00:00:00 2001 From: erciccione Date: Wed, 21 Dec 2022 16:09:03 +0000 Subject: [PATCH 1/2] gems: update dependencies - remove explicit dependency webrick. it's not needed anymore - force jekyll-multiple-languages-plugin version to 1.7.0, since later versions currently break jekyll - update Gemfile.lock --- Gemfile | 3 +-- Gemfile.lock | 61 +++++++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index 835c906c..19285c9d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,5 @@ gem 'jekyll' gem 'jekyll-paginate' gem 'builder' gem 'wdm', '>= 0.1.0' if Gem.win_platform? -gem 'jekyll-multiple-languages-plugin' +gem 'jekyll-multiple-languages-plugin', '= 1.7.0' gem 'jekyll-feed' -gem "webrick", "~> 1.7" diff --git a/Gemfile.lock b/Gemfile.lock index 400fee0c..ab2f8d20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,67 +1,71 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) builder (3.2.4) colorator (1.1.0) - concurrent-ruby (1.1.8) - em-websocket (0.5.2) + concurrent-ruby (1.1.10) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.0) + ffi (1.15.5) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (1.8.10) + google-protobuf (3.21.12) + http_parser.rb (0.8.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.0) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.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) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) - jekyll-feed (0.15.1) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-multiple-languages-plugin (1.7.0) jekyll (>= 2.0, < 5.0) jekyll-paginate (1.1.0) - jekyll-sass-converter (2.1.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.1) + listen (3.7.1) 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.6) - rb-fsevent (0.11.0) + public_suffix (5.0.1) + rake (13.0.6) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.26.0) + rouge (4.0.1) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.7.0) + sass-embedded (1.57.1) + google-protobuf (~> 3.21) + rake (>= 10.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.3.0) webrick (1.7.0) PLATFORMS @@ -71,9 +75,8 @@ DEPENDENCIES builder jekyll jekyll-feed - jekyll-multiple-languages-plugin + jekyll-multiple-languages-plugin (= 1.7.0) jekyll-paginate - webrick (~> 1.7) BUNDLED WITH 2.2.23 From c0ad3ace97b688c08c50fe21fb03f0a13ebb9e2e Mon Sep 17 00:00:00 2001 From: erciccione Date: Wed, 21 Dec 2022 16:28:14 +0000 Subject: [PATCH 2/2] ci: remove ruby versions 2.5 and 2.6 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d30bee4e..790716d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '2.5', '2.6', '2.7', '3.0.1' ] + ruby: [ '2.7', '3.0.1' ] name: Ruby ${{ matrix.ruby }} steps: - uses: actions/checkout@v2