Merge pull request #2140 from sparklemotion/flavorjones-drop-support-…

…for-2.4

Remove support for 2.4

.cross_rubies

@@ -18,8 +18,3 @@
 2.5.0:i686-linux-gnu
 2.5.0:x86_64-linux-gnu
 2.5.0:x86_64-darwin
-2.4.0:i686-w64-mingw32
-2.4.0:x86_64-w64-mingw32
-2.4.0:i686-linux-gnu
-2.4.0:x86_64-linux-gnu
-2.4.0:x86_64-darwin

CHANGELOG.md

@@ -60,6 +60,7 @@ This release introduces support for Ruby 2.7 and 3.0 in the precompiled native g
 This release ends support for:
 
 * Ruby 2.3, for which [official support ended on 2019-03-31](https://www.ruby-lang.org/en/news/2019/03/31/support-of-ruby-2-3-has-ended/) [[#1886](https://github.com/sparklemotion/nokogiri/issues/1886)] (Thanks [@ashmaroli](https://github.com/ashmaroli)!)
+* Ruby 2.4, for which [official support ended on 2020-04-05](https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/)
 * JRuby 9.1, which is the Ruby 2.3-compatible release.
 
 

Gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org/"
 gem "racc", "~>1.4"
 gem "mini_portile2", "~>2.5.0"
 
-gem "concourse", "~>0.39", :group => [:development, :test]
+gem "concourse", "~>0.40", :group => [:development, :test]
 gem "hoe", "~>3.22", ">=3.22.1", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2", :group => [:development, :test]
 gem "hoe-debugging", "~>2.0", :group => [:development, :test]
@@ -21,7 +21,6 @@ gem "rake-compiler-dock", "~>1.0", :group => [:development, :test]
 gem "rexical", "~>1.0.5", :group => [:development, :test]
 gem "rubocop", "~>0.88", :group => [:development, :test]
 gem "simplecov", "~>0.17.0", :group => [:development, :test]
-gem "parallel", "~>1.19.2", :group => [:development, :test]
 gem "rdoc", ">=4.0", "<7", :group => [:development, :test]
 
 # vim: syntax=ruby

README.md

@@ -129,7 +129,7 @@ end
 
 ## Requirements
 
-Ruby 2.4.0 or higher, including any development packages necessary to compile native extensions.
+Ruby 2.5.0 or higher, including any development packages necessary to compile native extensions.
 
 In Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the gem, but if you want to use the system versions:
 

Rakefile

@@ -41,6 +41,8 @@ HOE = Hoe.spec "nokogiri" do |hoe|
     "nokogiri.gemspec",
     "lib/nokogiri/nokogiri.{bundle,jar,rb,so}",
     "lib/nokogiri/[0-9].[0-9]",
+    "coverage",
+    "concourse/images/*.generated",
   ]
   hoe.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
 
@@ -55,7 +57,7 @@ HOE = Hoe.spec "nokogiri" do |hoe|
   end
 
   hoe.extra_dev_deps += [
-    ["concourse", "~> 0.39"],
+    ["concourse", "~> 0.40"],
     ["hoe", ["~> 3.22", ">= 3.22.1"]],
     ["hoe-bundler", "~> 1.2"],
     ["hoe-debugging", "~> 2.0"],
@@ -69,12 +71,11 @@ HOE = Hoe.spec "nokogiri" do |hoe|
     ["rexical", "~> 1.0.5"],
     ["rubocop", "~> 0.88"],
     ["simplecov", "~> 0.17.0"], # locked on 2020-08-28 due to https://github.com/codeclimate/test-reporter/issues/413
-    ["parallel", "~> 1.19.2"], # locked on 2020-11-10 because v1.20.0 does not support Ruby 2.4
   ]
 
   hoe.spec_extras = {
     :extensions => ["ext/nokogiri/extconf.rb"],
-    :required_ruby_version => ">= 2.4.0"
+    :required_ruby_version => ">= 2.5.0"
   }
 
   hoe.testlib = :minitest

appveyor.yml

@@ -58,11 +58,6 @@ environment:
       INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
       EXTCONF_PARAMS: "--use-system-libraries"
 
-    - ruby_version: 24-x64
-    - ruby_version: 24-x64
-      INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
-      EXTCONF_PARAMS: "--use-system-libraries"
-
 matrix:
   allow_failures:
     - ruby_version: head-x64

concourse/common_prelude.rb

@@ -1,12 +1,6 @@
 require "json"
 
-$git_resource_ignore_paths = [
-  "*.md",
-  "concourse/**",
-  "suppressions/**",
-  ".github/**",
-  "Vagrantfile",
-].to_json
-
 cross_rubies_path = File.join(File.dirname(__FILE__), "..", ".cross_rubies")
-$native_ruby_versions = File.read(cross_rubies_path).split("\n").map { |line| line.split(":").first.split(".").take(2).join(".") }.uniq.sort
+$native_ruby_versions = File.read(cross_rubies_path).split("\n").map do |line|
+  line.split(":").first.split(".").take(2).join(".")
+end.uniq.sort

concourse/nokogiri-pr.yml.generated

@@ -139,100 +139,6 @@ jobs:
         path: ci/concourse/tasks/rake-test/run.sh
     task: rake-test-32bit
   public: true
-- name: cruby-2.4
-  on_abort:
-    params:
-      base_context: ci.nokogiri.org
-      context: cruby-2.4
-      description: This job was terminated.
-      path: nokogiri-pr
-      status: ERROR
-    put: nokogiri-pr
-  on_error:
-    params:
-      base_context: ci.nokogiri.org
-      context: cruby-2.4
-      description: This job had errors.
-      path: nokogiri-pr
-      status: ERROR
-    put: nokogiri-pr
-  on_failure:
-    params:
-      base_context: ci.nokogiri.org
-      context: cruby-2.4
-      description: This job had some failed tests.
-      path: nokogiri-pr
-      status: FAILURE
-    put: nokogiri-pr
-  on_success:
-    params:
-      base_context: ci.nokogiri.org
-      context: cruby-2.4
-      description: Nokobot is happy with this job.
-      path: nokogiri-pr
-      status: SUCCESS
-    put: nokogiri-pr
-  plan:
-  - get: ci
-  - get: nokogiri-pr
-    passed:
-    - cruby-on-vanilla-ubuntu
-    trigger: true
-    version: every
-  - params:
-      base_context: ci.nokogiri.org
-      context: cruby-2.4
-      description: Nokobot is working, beep boop ...
-      path: nokogiri-pr
-      status: PENDING
-    put: nokogiri-pr
-  - config:
-      image_resource:
-        source:
-          repository: flavorjones/nokogiri-test
-          tag: mri-2.4
-        type: registry-image
-      inputs:
-      - name: ci
-      - name: nokogiri-pr
-        path: nokogiri
-      params:
-        TEST_WITH_SYSTEM_LIBRARIES: t
-      platform: linux
-      run:
-        path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test-system-libraries
-  - config:
-      image_resource:
-        source:
-          repository: flavorjones/nokogiri-test
-          tag: mri-2.4
-        type: registry-image
-      inputs:
-      - name: ci
-      - name: nokogiri-pr
-        path: nokogiri
-      platform: linux
-      run:
-        path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test-vendored-libraries
-  - config:
-      image_resource:
-        source:
-          repository: flavorjones/nokogiri-test
-          tag: mri-2.4
-        type: registry-image
-      inputs:
-      - name: ci
-      - name: nokogiri-pr
-        path: nokogiri
-      params:
-        TEST_WITH_VALGRIND: t
-      platform: linux
-      run:
-        path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test-valgrind
-  public: true
 - name: cruby-2.5
   on_abort:
     params:
@@ -755,7 +661,6 @@ jobs:
   - get: ci
   - get: nokogiri-pr
     passed:
-    - cruby-2.4
     - cruby-2.5
     - cruby-2.6
     - cruby-2.7
@@ -837,7 +742,6 @@ jobs:
   - get: ci
   - get: nokogiri-pr
     passed:
-    - cruby-2.4
     - cruby-2.5
     - cruby-2.6
     - cruby-2.7
@@ -922,7 +826,6 @@ jobs:
   - get: ci
   - get: nokogiri-pr
     passed:
-    - cruby-2.4
     - cruby-2.5
     - cruby-2.6
     - cruby-2.7
@@ -1021,7 +924,6 @@ jobs:
   - get: ci
   - get: nokogiri-pr
     passed:
-    - cruby-2.4
     - cruby-2.5
     - cruby-2.6
     - cruby-2.7
@@ -1054,21 +956,6 @@ jobs:
     task: build
   - in_parallel:
       steps:
-      - config:
-          image_resource:
-            source:
-              repository: flavorjones/nokogiri-test
-              tag: mri-2.4
-            type: registry-image
-          inputs:
-          - name: ci
-          - name: nokogiri-pr
-            path: nokogiri
-          - name: gems
-          platform: linux
-          run:
-            path: ci/concourse/tasks/gem-test/gem-install-and-test.sh
-        task: install-and-test-2.4
       - config:
           image_resource:
             source:
@@ -1182,7 +1069,6 @@ jobs:
   - get: ci
   - get: nokogiri-pr
     passed:
-    - cruby-2.4
     - cruby-2.5
     - cruby-2.6
     - cruby-2.7