Merge pull request #1704 from larskanis/win-ruby-2.5

Add support for Ruby-2.5 on Windows

.cross_rubies

@@ -1,3 +1,5 @@
+2.5.0:i686-w64-mingw32
+2.5.0:x86_64-w64-mingw32
 2.4.0:i686-w64-mingw32
 2.4.0:x86_64-w64-mingw32
 2.3.0:i686-w64-mingw32

CHANGELOG.md

@@ -9,6 +9,7 @@
 ## Features
 
 * [MRI] OpenBSD installation should be a bit easier now. [#1685] (Thanks, @jeremyevans!)
+* [MRI] Cross-built Windows gems now support Ruby 2.5
 
 
 ## Bug fixes

Gemfile

@@ -13,7 +13,7 @@ gem "hoe-git", "~>1.6", :group => [:development, :test]
 gem "minitest", "~>5.8.4", :group => [:development, :test]
 gem "rake", "~>12.0", :group => [:development, :test]
 gem "rake-compiler", "~>1.0.3", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.6.0", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.6.2", :group => [:development, :test]
 gem "racc", "~>1.4.14", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
 gem "rexical", "~>1.0.5", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
 gem "concourse", "~>0.15", :group => [:development, :test]

Rakefile

@@ -137,7 +137,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",           "~> 5.8.4"],
     ["rake",               "~> 12.0"],
     ["rake-compiler",      "~> 1.0.3"],
-    ["rake-compiler-dock", "~> 0.6.0"],
+    ["rake-compiler-dock", "~> 0.6.2"],
     ["racc",               "~> 1.4.14"],
     ["rexical",            "~> 1.0.5"],
     ["concourse",          "~> 0.15"],

appveyor.yml

@@ -1,24 +1,29 @@
 install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - SET PATH=C:\MinGW\bin;%PATH%
-  - SET RAKEOPT=-rdevkit
+  - SET PATH=C:\ruby%ruby_version%\bin;%PATH%
+  - ps: |
+      if ($env:ruby_version -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+      }
   - ruby --version
   - gem --version
+  - gem install bundler --conservative
   - bundle install
 
 build: off
 
 test_script:
-  - bundle exec rake
+  - bundle exec rake -rdevkit
 
 environment:
   matrix:
-    - ruby_version: "23"
-    - ruby_version: "23-x64"
-    - ruby_version: "22"
-    - ruby_version: "22-x64"
-    - ruby_version: "21"
-    - ruby_version: "21-x64"
-    - ruby_version: "200"
-    - ruby_version: "200-x64"
-    - ruby_version: "193"
+    - ruby_version: head-x64
+    - ruby_version: 24
+    - ruby_version: 23-x64
+    - ruby_version: 22
+    - ruby_version: 21-x64
+    - ruby_version: 200
+
+matrix:
+  allow_failures:
+    - ruby_version: head