Skip to content

Commit 0a48e7c

Browse files
authored
Merge pull request #4 from toyama0919/feature/test-pass-travis
fix not pass travis tests.
2 parents 606bb7e + 02af8b5 commit 0a48e7c

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/.bundle/
55
/vendor/
66
/Gemfile.lock
7+
*.jar

.travis.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
language: ruby
2-
cache: bundler
3-
rvm:
4-
- jruby-9.0.5.0
5-
- jruby-9.1.5.0
6-
- jruby-head
7-
jdk:
8-
- openjdk7
9-
before_install:
10-
- gem install bundler
2+
install: ./embulk.jar bundle install --path vendor/bundle
113
matrix:
4+
include:
5+
- env: EMBULK_VERSION=0.9.15
6+
rvm: jruby-9.1.5.0 # bundled jruby version
7+
jdk: openjdk8 # embulk 0.9.x uses jdk8
8+
- env: EMBULK_VERSION=latest
9+
rvm: jruby-9.1.5.0 # ?
10+
jdk: openjdk8 # ?
1211
allow_failures:
13-
- rvm: jruby-head
12+
- env: EMBULK_VERSION=latest
13+
before_install:
14+
- curl -o embulk.jar --create-dirs -L "http://dl.embulk.org/embulk-${EMBULK_VERSION}.jar"
15+
- chmod +x embulk.jar
16+
- ./embulk.jar gem install bundler
17+
script: ./embulk.jar bundle exec rake test

test/helper.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44

55
# require 'embulk/java/bootstrap'
66
require 'embulk'
7-
Embulk.setup
7+
begin
8+
# Embulk ~> 0.8.x
9+
Embulk.setup
10+
rescue NotImplementedError
11+
# Embulk ~> 0.9.x
12+
require 'embulk/java/bootstrap'
13+
end
814
Embulk.logger = Embulk::Logger.new('/dev/null')
915

1016
APP_ROOT = File.expand_path('../', __dir__)

0 commit comments

Comments
 (0)