##// END OF EJS Templates
Merged r14902, r14903 and r14904 from trunk to 3.2-stable...
Toshi MARUYAMA -
r14523:d20f0ada288f
parent child
Show More
@@ -6,12 +6,14 install:
6 - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
6 - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
7 - ruby --version
7 - ruby --version
8 - gem --version
8 - gem --version
9 - git --version
10 - hg --version
9
11
10 build: off
12 build: off
11
13
12 test_script:
14 test_script:
13 - bundle install --without rmagick
15 - bundle install --without rmagick
14 - set SCMS=git
16 - set SCMS=mercurial
15 - set RUN_ON_NOT_OFFICIAL=
17 - set RUN_ON_NOT_OFFICIAL=
16 - set RUBY_VER=1.9
18 - set RUBY_VER=1.9
17 - set BRANCH=trunk
19 - set BRANCH=trunk
@@ -30,7 +32,5 environment:
30 - ruby_version: "200-x64"
32 - ruby_version: "200-x64"
31 - ruby_version: "21"
33 - ruby_version: "21"
32 - ruby_version: "21-x64"
34 - ruby_version: "21-x64"
33 # Nokogori does not work on Windows Ruby 2.2
35 - ruby_version: "22"
34 # https://github.com/sparklemotion/nokogiri/issues/1256
36 - ruby_version: "22-x64"
35 # - ruby_version: "22"
36 # - ruby_version: "22-x64"
General Comments 0
You need to be logged in to leave comments. Login now