Skip to content

Commit b1483de

Browse files
committed
build_all now uses ruby 1.9.3 to build everything.
1 parent 6b1e4ed commit b1483de

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

build_all

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function rvm_use {
5353
set -o errexit
5454

5555
# initialize
56-
rvm_use 1.8.7
56+
rvm_use 1.9.3
5757
bundle install --quiet --local || bundle install
5858
rm -rf tmp pkg
5959
bundle exec rake clean
@@ -70,15 +70,7 @@ if [[ $platform =~ "64" ]] ; then
7070
echo ""
7171
exit 1
7272
fi
73-
rvm_use 1.8.7
74-
if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p358/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
75-
76-
# if this fails around the purelib.rb thing, try varying the ruby
77-
# used to run this script, and whether the HOST env var is set
78-
# below.
79-
80-
bundle exec rake-compiler cross-ruby VERSION=1.8.7-p358 # HOST=i386-mingw32
81-
fi
73+
rvm_use 1.9.3
8274
if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
8375
bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
8476
fi
@@ -90,15 +82,15 @@ bundle exec rake gem:windows
9082
cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
9183

9284
# MRI
93-
rvm_use 1.8.7
85+
rvm_use 1.9.3
9486
bundle exec rake gem
9587
cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
9688

9789
# jruby
9890
rvm_use jruby
9991
bundle install --quiet --local || bundle install
10092
bundle exec rake clean clobber
101-
rvm_use 1.8.7
93+
rvm_use 1.9.3
10294
bundle exec rake generate
10395
rvm_use jruby
10496
bundle exec rake gem

0 commit comments

Comments
 (0)