Merged r14902, r14903 and r14904 from trunk to 3.2-stable

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14905 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/appveyor.yml b/appveyor.yml
index 2fe77fb3be270bb98fac522948a8cc5a74d594da..b0ac65c5bc7d9819dbd968c37fecb3de606644d2 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,12 +6,14 @@ install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby --version
   - gem --version
+  - git --version
+  - hg  --version
 
 build: off
 
 test_script:
   - bundle install --without rmagick
-  - set SCMS=git
+  - set SCMS=mercurial
   - set RUN_ON_NOT_OFFICIAL=
   - set RUBY_VER=1.9
   - set BRANCH=trunk
@@ -30,7 +32,5 @@ environment:
     - ruby_version: "200-x64"
     - ruby_version: "21"
     - ruby_version: "21-x64"
-    # Nokogori does not work on Windows Ruby 2.2
-    # https://github.com/sparklemotion/nokogiri/issues/1256
-    # - ruby_version: "22"
-    # - ruby_version: "22-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"