Skip to content

Commit 6ffa7ec

Browse files
committed
[ci] run w latest 9.2 + test-compile before tests
1 parent 08d4383 commit 6ffa7ec

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.travis.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ install: if [[ -v BUNDLE_INSTALL ]]; then jruby -S bundle install; else echo "";
1919

2020
script: if [[ -v TEST_COMMAND ]]; then $TEST_COMMAND; else mvn verify -P $TEST_PROFILE; fi
2121

22+
__stub:
23+
- &rake_test_command TEST_COMMAND="jruby -rbundler/setup -S rake test_prepare && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
24+
2225
matrix:
2326
allow_failures:
2427
- jdk: openjdk7
@@ -33,34 +36,31 @@ matrix:
3336
include:
3437
# since maven runit fails to boot with test-unit being a default gem on 9.2 :
3538
- jdk: oraclejdk8
36-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
37-
rvm: jruby-9.2.5.0
38-
- jdk: oraclejdk8
39-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
40-
rvm: jruby-9.2.9.0
39+
env: *rake_test_command
40+
rvm: jruby-9.2.12.0
4141
#
4242
- jdk: openjdk7
43-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
43+
env: *rake_test_command
4444
rvm: jruby-1.7.24
4545
- jdk: oraclejdk8
46-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
46+
env: *rake_test_command
4747
rvm: jruby-1.7.27
4848
#
4949
- jdk: openjdk7
5050
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.26" BUNDLE_INSTALL=true
5151

5252
rvm: jruby-1.7.26
5353
- jdk: oraclejdk8
54-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
55-
rvm: jruby-9.2.8.0
56-
- jdk: oraclejdk11
57-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
54+
env: *rake_test_command
5855
rvm: jruby-9.2.9.0
56+
- jdk: oraclejdk11
57+
env: *rake_test_command
58+
rvm: jruby-9.2.11.1
5959
- jdk: oraclejdk8
60-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
60+
env: *rake_test_command
6161
rvm: jruby-head
6262
- jdk: oraclejdk11
63-
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -rbundler/setup -S rake test" BUNDLE_INSTALL=true
63+
env: *rake_test_command
6464
rvm: jruby-head
6565
#
6666
- jdk: oraclejdk8
@@ -77,7 +77,7 @@ matrix:
7777
rvm: jruby-9.1.17.0
7878
- jdk: oraclejdk11
7979
env: TEST_COMMAND="jruby -rbundler/setup -S rake integration:install integration:test" BUNDLE_INSTALL=true
80-
rvm: jruby-9.2.9.0
80+
rvm: jruby-9.2.12.0
8181
notifications:
8282
irc:
8383
channels:

Rakefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ else
2727
RubyMaven.exec( 'package -Dmaven.test.skip=true' )
2828
end
2929
end
30+
task :test_prepare do
31+
RubyMaven.exec( 'prepare-package -Dmaven.test.skip=true' )
32+
RubyMaven.exec( 'test-compile' ) # separate step due -Dmaven.test.skip=true
33+
end
3034
end
3135

3236
task :build do

0 commit comments

Comments
 (0)