Upgrade jekyll (#55)

* update gems+rubyversion * upgrade to jekyll 3.9.2 * add linux platform to .lock
omegat-org · Sep 20, 2022 · e79a9a1 · e79a9a1
1 parent 4e96d1c
commit e79a9a1
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 53 deletions.
diff --git a/.github/workflows/publish_site.yml b/.github/workflows/publish_site.yml
@@ -30,30 +30,43 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout 🛎
         uses: actions/checkout@v3
 
-      - name: Setup Ruby
+      - name: Setup Ruby 💎
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5.5' # Not needed with a .ruby-version file
+          ruby-version: '2.7.6' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
 
-      - name: Setup Pages
+      - name: Setup Pages 📃
         id: pages
         uses: actions/configure-pages@v2
 
-      - name: Patch jekyll/assets/utils.rb
-        run: patch --verbose vendor/bundle/ruby/2.5.0/gems/jekyll-assets-3.0.12/lib/jekyll/assets/utils.rb _patch_multiple-language/jekyll_assets_utils.patch
+      #- name: Install HTML Proofer 🔧
+      #  run: gem install html-proofer
 
-      - name: Build with Jekyll
+      - name: Patch jekyll/assets/utils.rb 🧷
+        run: patch --verbose vendor/bundle/ruby/2.7.0/gems/jekyll-assets-3.0.12/lib/jekyll/assets/utils.rb _patch_multiple-language/jekyll_assets_utils.patch
+
+      - 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
+      #- name: Check for broken links 🧐🔗
+      #  run: htmlproofer --log-level :debug _site 2> links.log
+      #  continue-on-error: true
+
+      - name: Archive checker log 🗄
+        uses: actions/upload-artifact@v1
+        with:
+          name: links-check.log
+          path: links.log
+
+      - name: Upload artifact 🚚
         # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v1
 
@@ -65,6 +78,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - name: Deploy to GitHub Pages
+      - name: Deploy to GitHub Pages 🎉
         id: deployment
         uses: actions/deploy-pages@v1
diff --git a/Gemfile b/Gemfile
@@ -12,9 +12,9 @@ ruby RUBY_VERSION
 
 # jekyll 3.5.0 doesn't work with jekyll-multiple-languages-plugin
 #"gem "jekyll", "3.5.0"
-gem "jekyll", "3.6.3"
+gem "jekyll", "3.9.2"
 gem "sprockets", "~> 3.7"
-gem "nokogiri", "1.11.2"
+gem "nokogiri", ">= 1.13.6"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.0"
@@ -38,8 +38,3 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Please add the following to your Gemfile to avoid polling for changes:
 #gem 'wdm', '>= 0.1.0' if Gem.win_platform?
-
-# Cannot make html-proofer work on windows (libcurl not available)
-#if !Gem.win_platform?
-#   gem 'html-proofer'
-#end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,34 +1,42 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     execjs (2.8.1)
     extras (0.3.0)
       forwardable-extended (~> 2.5)
-    fastimage (2.2.3)
-    ffi (1.15.0)
-    ffi (1.15.0-x64-mingw32)
+    fastimage (2.2.6)
+    ffi (1.15.5)
+    ffi (1.15.5-x64-mingw32)
     forwardable-extended (2.6.0)
-    i18n (1.8.10)
+    http_parser.rb (0.8.0)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.6.3)
+    jekyll (3.9.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.14)
+      jekyll-watch (~> 2.0)
+      kramdown (>= 1.17, < 3)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 3)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
     jekyll-assets (3.0.12)
       activesupport (~> 5.0)
@@ -41,9 +49,9 @@ GEM
       nokogiri (~> 1.8)
       pathutil (~> 0.16)
       sprockets (>= 3.3, < 4.1.beta)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
-    jekyll-multiple-languages-plugin (1.7.0)
+    jekyll-feed (0.16.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-multiple-languages-plugin (1.8.0)
       jekyll (>= 2.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
@@ -52,41 +60,41 @@ GEM
       pathutil (~> 0.16)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-watch (1.5.1)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    kramdown (2.4.0)
+      rexml
     liquid (4.0.3)
     liquid-tag-parser (1.9.0)
       extras (~> 0.3)
       liquid (>= 3.0, < 5.0)
-    listen (3.5.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    nokogiri (1.11.2-x64-mingw32)
+    minitest (5.16.3)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.5.2)
+    public_suffix (5.0.0)
+    racc (1.6.0)
     rack (2.2.4)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (2.2.1)
+    rexml (3.2.5)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -99,30 +107,31 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2022.3)
       tzinfo (>= 1.0.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
-  jekyll (= 3.6.3)
+  jekyll (= 3.9.2)
   jekyll-assets
   jekyll-feed (~> 0.6)
   jekyll-multiple-languages-plugin
   jekyll-redirect-from
   jekyll-sitemap
   minima (~> 2.0)
-  nokogiri (= 1.11.2)
+  nokogiri (>= 1.13.6)
   sprockets (~> 3.7)
   tzinfo-data
   uglifier
 
 RUBY VERSION
-   ruby 2.5.5p157
+   ruby 2.7.6p219
 
 BUNDLED WITH
-   1.16.1
+   2.3.22