Skip to content

Commit d045c15

Browse files
committed
[build] -rbundler/setup + simplify bundle install
1 parent 6149699 commit d045c15

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ matrix:
2222
fast_finish: true
2323
allow_failures:
2424
- rvm: jruby-head
25-
- script: jruby -rbundler/setup -S rake integration:install integration:test
2625
include:
2726
- rvm: jruby-head
2827
script: jruby -rbundler/setup -S rake test
2928
- rvm: jruby-9.1.17.0
30-
script: jruby -rbundler/setup -S rake integration:install integration:test
29+
script: jruby -S rake integration:test
3130
- jdk: oraclejdk11
3231
rvm: jruby-9.2.20.0
33-
script: jruby -rbundler/setup -S rake integration:install integration:test
32+
script: jruby -S rake integration:test
3433

3534
cache:
3635
directories:

Rakefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ task :test => 'lib/jopenssl.jar'
4242
namespace :integration do
4343
it_path = File.expand_path('../src/test/integration', __FILE__)
4444
task :install do
45-
Dir.chdir(it_path) do
46-
ruby "-S bundle install --gemfile '#{it_path}/Gemfile'"
47-
end
45+
ruby "-C #{it_path} -S bundle install"
4846
end
4947
# desc "Run IT tests"
5048
task :test => 'lib/jopenssl.jar' do
@@ -53,6 +51,6 @@ namespace :integration do
5351
end
5452
loader = "ARGV.each { |f| require f }" ; lib = [ 'lib', it_path ]
5553
test_files = FileList['src/test/integration/*_test.rb'].map { |path| path.sub('src/test/integration/', '') }
56-
ruby "-I#{lib.join(':')} -C src/test/integration -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
54+
ruby "-I#{lib.join(':')} -C src/test/integration -rbundler/setup -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
5755
end
5856
end

0 commit comments

Comments
 (0)