Update and fix CI for 3.9-stable on Ruby 3.x (#8942)

* Copy-paste CI workflow from `master`
* Copy-paste Release workflow from `master`
* Fix Ruby 3.0 and 3.1 compatibility issues
* Add webrick gem to bundle on Ruby 3.x
* Stop using `Kernel#exec` to check for python presence, since it replaces the current process
* Read `/proc/version` using `File.read` directly
* Fix some style offenses in touched files

Co-authored-by: Ashwin Maroli <ashmaroli@gmail.com>

Author: parkr

.github/workflows/ci.yml

@@ -3,98 +3,69 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - 3.9-stable
+      - master
+      - "*-stable"
   pull_request:
     branches:
-      - 3.9-stable
+      - master
+      - "*-stable"
 
 jobs:
-  cruby:
-    if: "!contains(github.event.commits[0].message, '[ci skip]')"
-    name: 'Ruby ${{ matrix.ruby_version }}'
-    runs-on: 'ubuntu-latest'
+  ci:
+    name: "Run Tests (${{ matrix.label }})"
+    runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
       matrix:
-        ruby_version:
-        - 2.5
-        - 2.7
+        include:
+          - label: Ruby 2.5
+            ruby_version: "2.5"
+          - label: Ruby 2.7
+            ruby_version: "2.7"
+          - label: Ruby 3.0
+            ruby_version: "3.0"
+          - label: Ruby 3.1
+            ruby_version: "3.1"
+          - label: JRuby 9.2.20.1
+            ruby_version: "jruby-9.2.20.1"
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 5
-      - name: "Set up Ruby ${{ matrix.ruby_version }}"
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby_version }}
-          bundler-cache: true
-      - name: Execute Unit Tests
-        run:  bash script/test
-      - name: Execute Cucumber Scenarios
-        run:  bash script/cucumber
-      - name: Create and Build new site
-        run:  bash script/default-site
-
-  jruby:
-    if: "!contains(github.event.commits[0].message, '[ci skip]')"
-    name: JRuby
-    runs-on: 'ubuntu-latest'
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_version:
-        - jruby
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 5
-      - name: "Set up Ruby ${{ matrix.ruby_version }}"
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: "Set up ${{ matrix.label }}"
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
           bundler-cache: true
-      - name: Execute Unit Tests
-        run:  bash script/test
+      - name: Run Minitest based tests
+        run: bash script/test
+      - name: Run Cucumber based tests
+        if: "!contains(matrix.ruby_version, 'jruby')"
+        run: bash script/cucumber
+      - name: Generate and Build a new site
+        run: bash script/default-site
 
-  profile_docs:
-    if: "!contains(github.event.commits[0].message, '[ci skip]')"
-    name: 'Profile Docs Site (Ruby ${{ matrix.ruby_version }})'
-    runs-on: 'ubuntu-latest'
+  xtras:
+    name: "${{ matrix.job_name }} (Ruby ${{ matrix.ruby_version }})"
+    runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
       matrix:
-        ruby_version:
-        - 2.5
+        include:
+          - job_name: "Profile Docs Site"
+            step_name: "Build and Profile docs site"
+            script_file: "profile-docs"
+            ruby_version: "2.5"
+          - job_name: "Style Check"
+            step_name: "Run RuboCop"
+            script_file: "fmt"
+            ruby_version: "2.5"
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 5
-      - name: "Set up Ruby ${{ matrix.ruby_version }}"
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby_version }}
-          bundler-cache: true
-      - name: Profile building docs site
-        run:  bash script/profile-docs
-
-  style_check:
-    if: "!contains(github.event.commits[0].message, '[ci skip]')"
-    name: 'Style Check (Ruby ${{ matrix.ruby_version }})'
-    runs-on: 'ubuntu-latest'
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_version:
-        - 2.5 
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 5
+      - name: Checkout Repository
+        uses: actions/checkout@v2
       - name: "Set up Ruby ${{ matrix.ruby_version }}"
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
           bundler-cache: true
-      - name: Run RuboCop
-        run:  bash script/fmt
+      - name: ${{ matrix.step_name }}
+        run: bash script/${{ matrix.script_file }}

.github/workflows/release.yml

@@ -0,0 +1,34 @@
+name: Release Gem
+
+on:
+  push:
+    branches:
+      - master
+      - "*-stable"
+    paths:
+      - "lib/**/version.rb"
+
+jobs:
+  release:
+    if: "github.repository_owner == 'jekyll'"
+    name: "Release Gem (Ruby ${{ matrix.ruby_version }})"
+    runs-on: "ubuntu-latest"
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby_version:
+          - 2.7
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: "Set up Ruby ${{ matrix.ruby_version }}"
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+      - name: Build and Publish Gem
+        uses: ashmaroli/release-gem@dist
+        with:
+          gemspec_name: jekyll
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_GEM_PUSH_API_KEY }}

Gemfile

@@ -7,28 +7,28 @@ gem "rake", "~> 12.0"
 
 gem "rouge", ENV["ROUGE"] if ENV["ROUGE"]
 
-# Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
-gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"
-
 group :development do
   gem "launchy", "~> 2.3"
   gem "pry"
 
-  unless RUBY_ENGINE == "jruby"
-    gem "pry-byebug"
-  end
+  gem "pry-byebug" unless RUBY_ENGINE == "jruby"
 end
 
 #
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.5"
-  gem "cucumber", RUBY_VERSION >= "2.2" ? "~> 3.0" : "3.0.1"
+  gem "cucumber", "~> 3.0"
   gem "httpclient"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
-  # nokogiri v1.10 does not work with ruby 2.2 and below
-  gem "nokogiri", RUBY_VERSION >= "2.3" ? "~> 1.9" : "~> 1.9.0"
+  gem "nokogiri", "~> 1.9"
+
+  # Ruby 3.1.0 shipped with `psych-4.0.3` which caused some of our Cucumber-based tests to fail.
+  # TODO: Remove lock once we implement a way to use Psych 4 without breaking anything.
+  # See https://github.com/jekyll/jekyll/pull/8918
+  gem "psych", "~> 3.3"
+
   gem "rspec"
   gem "rspec-mocks"
   gem "rubocop", "~> 0.56.0"
@@ -37,6 +37,8 @@ group :test do
   gem "test-theme-skinny", :path => File.expand_path("test/fixtures/test-theme-skinny", __dir__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)
 
+  gem "webrick" if RUBY_VERSION >= "3"
+
   # http_parser.rb has stopped shipping jruby-compatible versions
   # latest compatible one was 0.6.0 https://rubygems.org/gems/http_parser.rb
   if RUBY_ENGINE == "jruby"
@@ -48,9 +50,7 @@ end
 #
 
 group :test_legacy do
-  if RUBY_PLATFORM =~ %r!cygwin! || RUBY_VERSION.start_with?("2.2")
-    gem "test-unit"
-  end
+  gem "test-unit" if RUBY_PLATFORM =~ %r!cygwin!
 
   gem "minitest"
   gem "minitest-profile"
@@ -79,9 +79,14 @@ group :jekyll_optional_dependencies do
   gem "jekyll-gist"
   gem "jekyll-paginate"
   gem "jekyll-redirect-from"
+
+  # Add gem 'matrix'
+  # Ref: https://github.com/jekyll/jekyll/commit/d0eb07ba29dc7d5f52defab855bdb7a768cf824c
+  gem "matrix"
+
   gem "mime-types", "~> 3.0"
-  gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
-  gem "tomlrb", "~> 1.2"
+  gem "rdoc", "~> 6.3.0"
+  gem "tomlrb", "~> 2.0"
 
   if ENV["KRAMDOWN_VERSION"].nil? || ENV["KRAMDOWN_VERSION"].to_i >= 2
     gem "kramdown-syntax-coderay"
@@ -92,7 +97,7 @@ group :jekyll_optional_dependencies do
 
   platform :ruby, :mswin, :mingw, :x64_mingw do
     gem "classifier-reborn", "~> 2.2.0"
-    gem "liquid-c", "~> 3.0"
+    gem "liquid-c", "~> 4.0"
     gem "pygments.rb", "~> 1.0"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
@@ -106,9 +111,7 @@ end
 #
 
 group :site do
-  if ENV["PROOF"]
-    gem "html-proofer", "~> 3.4"
-  end
+  gem "html-proofer", "~> 3.4" if ENV["PROOF"]
 
   gem "jekyll-avatar"
   gem "jekyll-mentions"

lib/jekyll/readers/data_reader.rb

@@ -54,16 +54,14 @@ def read_data_to(dir, data)
     def read_data_file(path)
       case File.extname(path).downcase
       when ".csv"
-        CSV.read(path, {
+        CSV.read(path,
           :headers  => true,
-          :encoding => site.config["encoding"],
-        }).map(&:to_hash)
+          :encoding => site.config["encoding"]).map(&:to_hash)
       when ".tsv"
-        CSV.read(path, {
+        CSV.read(path,
           :col_sep  => "\t",
           :headers  => true,
-          :encoding => site.config["encoding"],
-        }).map(&:to_hash)
+          :encoding => site.config["encoding"]).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end

lib/jekyll/utils/platforms.rb

@@ -70,9 +70,9 @@ def linux?
       private
       def proc_version
         @proc_version ||= begin
-          Pathutil.new(
+          File.read(
             "/proc/version"
-          ).read
+          ).downcase
         rescue Errno::ENOENT
           nil
         end