summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-11-30 13:05:19 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-11-30 13:05:19 +0000
commitd20f0ada288fcf4689526afe32f9f0d87653920c (patch)
treed3973ee0462c5482b68c5923144a6f01950cfcbc
parent6dfc3c34eb97f86eb7d17805386d58f03ffd9c2e (diff)
downloadredmine-d20f0ada288fcf4689526afe32f9f0d87653920c.tar.gz
redmine-d20f0ada288fcf4689526afe32f9f0d87653920c.zip
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
-rw-r--r--appveyor.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 2fe77fb3b..b0ac65c5b 100644
--- 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"