From 1260e6880593e4065e605b4fef8e6848241a3bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Fri, 11 Feb 2022 15:47:01 +0100 Subject: [PATCH 1/2] Upgrade to Ruby 2.7.5 and apply `bundle update`. --- .github/workflows/ci.yml | 2 +- .github/workflows/deploy.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 43 ++++++++++++++++++------------------ README.md | 2 +- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 746c70f0..e316efda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.4.4 + ruby-version: 2.7.5 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Build run: bundle exec jekyll build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b6f2f993..fc4bc66e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.4.4 + ruby-version: 2.7.5 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Build run: bundle exec jekyll build diff --git a/Gemfile b/Gemfile index 411271c3..0acb1246 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby '2.4.4' +ruby '2.7.5' gem 'ruby_dep', '1.3.1' gem 'jekyll', '3.8.5' gem 'jekyll-paginate', '1.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index a6499aff..ac37ef95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.3) - em-websocket (0.5.1) + concurrent-ruby (1.1.9) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) execjs (2.6.0) fastimage (1.8.1) addressable (~> 2.3, >= 2.3.5) - ffi (1.9.25) - ffi (1.9.25-x64-mingw32) + ffi (1.15.5) + ffi (1.15.5-x64-mingw32) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.8.5) @@ -41,33 +41,32 @@ GEM jekyll-paginate (1.1.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (2.1.2) + jekyll-watch (2.2.1) listen (~> 3.0) - json (2.3.1) + json (2.6.1) kramdown (1.17.0) - liquid (4.0.1) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + liquid (4.0.3) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) rack (2.2.3) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (3.3.0) + rb-fsevent (0.11.1) + rb-inotify (0.10.1) + ffi (~> 1.0) + rouge (3.28.0) ruby_dep (1.3.1) - safe_yaml (1.0.4) + safe_yaml (1.0.5) sass (3.4.20) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.2.1) + sprockets-helpers (1.4.0) sprockets (>= 2.2) - tilt (2.0.9) + tilt (2.0.10) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) @@ -86,7 +85,7 @@ DEPENDENCIES uglifier (= 2.7.2) RUBY VERSION - ruby 2.4.4p296 + ruby 2.7.5p203 BUNDLED WITH - 2.0.1 + 2.3.7 diff --git a/README.md b/README.md index e4f4c2bb..3a286116 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ we will need to set up some Ruby tooling. First, install RVM (Ruby Version Manager): https://rvm.io/rvm/install Then run the following commands: ```bash -$ rvm use 2.4.4 --install +$ rvm use 2.7.5 --install # Set up Bundler, a Ruby package manager # It downloads dependencies specified in a Gemfile From 6dfb1fd04e92174397ffd6a574c73ea423a58cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Fri, 11 Feb 2022 16:15:49 +0100 Subject: [PATCH 2/2] Upgrade to jekyll 3.9.1. * Manually upgrade to jekyll 3.9.1. * Add `kramdown-parser-gfm` which is now required. * Run `bundle update`. --- Gemfile | 3 ++- Gemfile.lock | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 0acb1246..264de9d0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,10 @@ source "https://rubygems.org" ruby '2.7.5' gem 'ruby_dep', '1.3.1' -gem 'jekyll', '3.8.5' +gem 'jekyll', '3.9.1' gem 'jekyll-paginate', '1.1.0' gem 'jekyll-assets', '2.1.2' gem 'sass', '3.4.20' gem 'execjs', '2.6.0' gem 'uglifier', '2.7.2' +gem "kramdown-parser-gfm", "~> 1.1" diff --git a/Gemfile.lock b/Gemfile.lock index ac37ef95..9185ccaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,14 +19,14 @@ GEM http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.9.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 0.7) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (>= 1.17, < 3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) @@ -44,7 +44,10 @@ GEM jekyll-watch (2.2.1) listen (~> 3.0) json (2.6.1) - kramdown (1.17.0) + kramdown (2.3.1) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -57,6 +60,7 @@ GEM rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) + rexml (3.2.5) rouge (3.28.0) ruby_dep (1.3.1) safe_yaml (1.0.5) @@ -77,9 +81,10 @@ PLATFORMS DEPENDENCIES execjs (= 2.6.0) - jekyll (= 3.8.5) + jekyll (= 3.9.1) jekyll-assets (= 2.1.2) jekyll-paginate (= 1.1.0) + kramdown-parser-gfm (~> 1.1) ruby_dep (= 1.3.1) sass (= 3.4.20) uglifier (= 2.7.2)