Skip to content

Commit a408b4f

Browse files
committed
try running with an explicitly specified ruby version (in case we run specs from mvn)
1 parent 6fb2abd commit a408b4f

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

.travis.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ gemfile:
2727
#- gemfiles/rails41.gemfile
2828
env:
2929
- JRUBY_OPTS="--1.8 $JRUBY_OPTS"
30-
- JRUBY_OPTS="$JRUBY_OPTS"
31-
before_script: export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false -J-XX:MaxPermSize=128m"
30+
- JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION" # for mvn's jruby plugins
31+
before_script:
32+
- export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false -J-XX:MaxPermSize=128m"
33+
- export JRUBY_VERSION="1.7.12"
3234
before_install:
3335
- ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
3436
- ((echo $BUNDLE_GEMFILE | grep rails23) && jruby --1.9 -S gem update --system 1.8.29) || true
@@ -117,15 +119,15 @@ matrix:
117119
jdk: oraclejdk8
118120
- rvm: jruby-head
119121
gemfile: gemfiles/rails23.gemfile
120-
env: JRUBY_OPTS="$JRUBY_OPTS"
122+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
121123
jdk: openjdk6
122124
- rvm: jruby-head
123125
gemfile: gemfiles/rails23.gemfile
124-
env: JRUBY_OPTS="$JRUBY_OPTS"
126+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
125127
jdk: oraclejdk7
126128
- rvm: jruby-head
127129
gemfile: gemfiles/rails23.gemfile
128-
env: JRUBY_OPTS="$JRUBY_OPTS"
130+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
129131
jdk: oraclejdk8
130132
## do not run with 3.0 (jruby-head) :
131133
- rvm: jruby-head
@@ -142,15 +144,15 @@ matrix:
142144
jdk: oraclejdk8
143145
- rvm: jruby-head
144146
gemfile: gemfiles/rails30.gemfile
145-
env: JRUBY_OPTS="$JRUBY_OPTS"
147+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
146148
jdk: openjdk6
147149
- rvm: jruby-head
148150
gemfile: gemfiles/rails30.gemfile
149-
env: JRUBY_OPTS="$JRUBY_OPTS"
151+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
150152
jdk: oraclejdk7
151153
- rvm: jruby-head
152154
gemfile: gemfiles/rails30.gemfile
153-
env: JRUBY_OPTS="$JRUBY_OPTS"
155+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
154156
jdk: oraclejdk8
155157
## do not run with 3.1 (jruby-head) :
156158
- rvm: jruby-head
@@ -167,13 +169,13 @@ matrix:
167169
jdk: oraclejdk8
168170
- rvm: jruby-head
169171
gemfile: gemfiles/rails31.gemfile
170-
env: JRUBY_OPTS="$JRUBY_OPTS"
172+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
171173
jdk: openjdk6
172174
- rvm: jruby-head
173175
gemfile: gemfiles/rails31.gemfile
174-
env: JRUBY_OPTS="$JRUBY_OPTS"
176+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
175177
jdk: oraclejdk7
176178
- rvm: jruby-head
177179
gemfile: gemfiles/rails31.gemfile
178-
env: JRUBY_OPTS="$JRUBY_OPTS"
180+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
179181
jdk: oraclejdk8

src/spec/ruby/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
$CLASSPATH << File.expand_path('test-classes', target)
1616
jars.each { |jar| $CLASSPATH << File.expand_path(jar, lib) }
1717

18+
puts "using JRuby #{JRUBY_VERSION} (#{RUBY_VERSION})"
19+
1820
# Java imports :
1921
java_import 'javax.servlet.ServletContext'
2022
java_import 'javax.servlet.ServletConfig'

0 commit comments

Comments
 (0)