Skip to content

Commit 1cde111

Browse files
kareskares
committed
[travis-ci] use latest JRuby 1.7 and do some testing against 9K, default JDK to 7
1 parent 5b7777b commit 1cde111

File tree

1 file changed

+98
-37
lines changed

1 file changed

+98
-37
lines changed

‎.travis.yml‎

Lines changed: 98 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ before_script:
88
before_install:
99
- ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
1010
rvm:
11-
- jruby-1.7.18
12-
#- jruby-head # 9000 ignores --1.8 and --1.9 switches
11+
- jruby-1.7.24
1312
jdk:
14-
- openjdk6
13+
- openjdk7
1514
gemfile:
1615
- gemfiles/rails23.gemfile
1716
- gemfiles/rails30.gemfile
@@ -52,96 +51,158 @@ matrix:
5251
include: # testing against MariaDB
5352
- addons:
5453
mariadb: '5.5'
55-
rvm: jruby-1.7.18
54+
rvm: jruby-1.7.24
5655
gemfile: gemfiles/rails32.gemfile
5756
env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
58-
jdk: openjdk7
57+
jdk: openjdk6
5958
- addons:
6059
mariadb: '10.0'
61-
rvm: jruby-1.7.18
60+
rvm: jruby-1.7.24
6261
gemfile: gemfiles/rails40.gemfile
6362
env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb
6463
jdk: openjdk7
6564
- addons:
6665
mariadb: '10.0'
67-
rvm: jruby-1.7.18
66+
rvm: jruby-1.7.24
6867
gemfile: gemfiles/rails41.gemfile
6968
env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb PREPARED_STATEMENTS=true
70-
jdk: openjdk7
69+
jdk: openjdk8
70+
# include some tests on JDK 6 :
71+
- rvm: jruby-1.7.24
72+
gemfile: gemfiles/rails42.gemfile
73+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
74+
jdk: openjdk6
75+
- rvm: jruby-1.7.24
76+
gemfile: gemfiles/rails42.gemfile
77+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
78+
jdk: openjdk6
79+
- rvm: jruby-1.7.24
80+
gemfile: gemfiles/rails42.gemfile
81+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
82+
jdk: openjdk6
83+
- rvm: jruby-1.7.24
84+
gemfile: gemfiles/rails42.gemfile
85+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
86+
jdk: openjdk6
87+
- rvm: jruby-1.7.24
88+
gemfile: gemfiles/rails42.gemfile
89+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
90+
jdk: openjdk6
91+
- rvm: jruby-1.7.24
92+
gemfile: gemfiles/rails42.gemfile
93+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
94+
jdk: openjdk6
95+
# include testing with JRuby 9K :
96+
- rvm: jruby-9.0.5.0
97+
gemfile: gemfiles/rails42.gemfile
98+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
99+
jdk: oraclejdk7
100+
- rvm: jruby-9.0.5.0
101+
gemfile: gemfiles/rails42.gemfile
102+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
103+
jdk: oraclejdk7
104+
- rvm: jruby-9.0.5.0
105+
gemfile: gemfiles/rails42.gemfile
106+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
107+
jdk: oraclejdk7
108+
- rvm: jruby-9.0.5.0
109+
gemfile: gemfiles/rails42.gemfile
110+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
111+
jdk: oraclejdk8
112+
- rvm: jruby-9.0.5.0
113+
gemfile: gemfiles/rails42.gemfile
114+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
115+
jdk: oraclejdk8
116+
- rvm: jruby-9.0.5.0
117+
gemfile: gemfiles/rails42.gemfile
118+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
119+
jdk: oraclejdk8
120+
- rvm: jruby-9.0.5.0
121+
gemfile: gemfiles/rails42.gemfile
122+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
123+
jdk: oraclejdk8
124+
- rvm: jruby-9.0.5.0
125+
gemfile: gemfiles/rails42.gemfile
126+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
127+
jdk: oraclejdk8
128+
- rvm: jruby-9.0.5.0
129+
gemfile: gemfiles/rails42.gemfile
130+
env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
131+
jdk: oraclejdk8
71132
exclude:
72133
# Rails 4 prefers Ruby 2.0 (or at least >= 1.9.3) :
73-
- rvm: jruby-1.7.18
134+
- rvm: jruby-1.7.24
74135
gemfile: gemfiles/rails40.gemfile
75136
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
76-
- rvm: jruby-1.7.18
137+
- rvm: jruby-1.7.24
77138
gemfile: gemfiles/rails40.gemfile
78139
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
79-
- rvm: jruby-1.7.18
140+
- rvm: jruby-1.7.24
80141
gemfile: gemfiles/rails40.gemfile
81142
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
82-
- rvm: jruby-1.7.18
143+
- rvm: jruby-1.7.24
83144
gemfile: gemfiles/rails40.gemfile
84145
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
85-
- rvm: jruby-1.7.18
146+
- rvm: jruby-1.7.24
86147
gemfile: gemfiles/rails40.gemfile
87148
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
88-
- rvm: jruby-1.7.18
149+
- rvm: jruby-1.7.24
89150
gemfile: gemfiles/rails40.gemfile
90151
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
91-
- rvm: jruby-1.7.18
152+
- rvm: jruby-1.7.24
92153
gemfile: gemfiles/rails40.gemfile
93154
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
94-
- rvm: jruby-1.7.18
155+
- rvm: jruby-1.7.24
95156
gemfile: gemfiles/rails40.gemfile
96157
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
97158
# Rails 4.1 does not support Ruby 1.8 :
98-
- rvm: jruby-1.7.18
159+
- rvm: jruby-1.7.24
99160
gemfile: gemfiles/rails41.gemfile
100161
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
101-
- rvm: jruby-1.7.18
162+
- rvm: jruby-1.7.24
102163
gemfile: gemfiles/rails41.gemfile
103164
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
104-
- rvm: jruby-1.7.18
165+
- rvm: jruby-1.7.24
105166
gemfile: gemfiles/rails41.gemfile
106167
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
107-
- rvm: jruby-1.7.18
168+
- rvm: jruby-1.7.24
108169
gemfile: gemfiles/rails41.gemfile
109170
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
110-
- rvm: jruby-1.7.18
171+
- rvm: jruby-1.7.24
111172
gemfile: gemfiles/rails41.gemfile
112173
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
113-
- rvm: jruby-1.7.18
174+
- rvm: jruby-1.7.24
114175
gemfile: gemfiles/rails41.gemfile
115176
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
116-
- rvm: jruby-1.7.18
177+
- rvm: jruby-1.7.24
117178
gemfile: gemfiles/rails41.gemfile
118179
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
119-
- rvm: jruby-1.7.18
180+
- rvm: jruby-1.7.24
120181
gemfile: gemfiles/rails41.gemfile
121182
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
122183
# Rails 4.2 will not support Ruby 1.8 :
123-
- rvm: jruby-1.7.18
184+
- rvm: jruby-1.7.24
124185
gemfile: gemfiles/rails42.gemfile
125186
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
126-
- rvm: jruby-1.7.18
187+
- rvm: jruby-1.7.24
127188
gemfile: gemfiles/rails42.gemfile
128189
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
129-
- rvm: jruby-1.7.18
190+
- rvm: jruby-1.7.24
130191
gemfile: gemfiles/rails42.gemfile
131192
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
132-
- rvm: jruby-1.7.18
193+
- rvm: jruby-1.7.24
133194
gemfile: gemfiles/rails42.gemfile
134195
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
135-
- rvm: jruby-1.7.18
196+
- rvm: jruby-1.7.24
136197
gemfile: gemfiles/rails42.gemfile
137198
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
138-
- rvm: jruby-1.7.18
199+
- rvm: jruby-1.7.24
139200
gemfile: gemfiles/rails42.gemfile
140201
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
141-
- rvm: jruby-1.7.18
202+
- rvm: jruby-1.7.24
142203
gemfile: gemfiles/rails42.gemfile
143204
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
144-
- rvm: jruby-1.7.18
205+
- rvm: jruby-1.7.24
145206
gemfile: gemfiles/rails42.gemfile
146207
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
147208
## JRuby 9K :
@@ -280,19 +341,19 @@ matrix:
280341
- rvm: jruby-head
281342
gemfile: gemfiles/rails41.gemfile
282343
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
283-
- rvm: jruby-1.7.18
344+
- rvm: jruby-1.7.24
284345
gemfile: gemfiles/rails41.gemfile
285346
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
286-
- rvm: jruby-1.7.18
347+
- rvm: jruby-1.7.24
287348
gemfile: gemfiles/rails41.gemfile
288349
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
289-
- rvm: jruby-1.7.18
350+
- rvm: jruby-1.7.24
290351
gemfile: gemfiles/rails41.gemfile
291352
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
292-
- rvm: jruby-1.7.18
353+
- rvm: jruby-1.7.24
293354
gemfile: gemfiles/rails41.gemfile
294355
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
295-
- rvm: jruby-1.7.18
356+
- rvm: jruby-1.7.24
296357
gemfile: gemfiles/rails41.gemfile
297358
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
298359
# Rails 4.2 (JRuby 9K) :

0 commit comments

Comments
 (0)