Skip to content

Commit

Permalink
Use Gemfile to install rspec for now
Browse files Browse the repository at this point in the history
Something changed on rubygems.org that's causing the mavengem
plugin to produce "marshal data too short" errors. While we
investigate, remove rspec from -Pbootstrap mavengems and instead
use bundler to install it in CI.

See jruby/jruby-maven-plugins#107
  • Loading branch information
headius committed Jul 16, 2020
1 parent d29e1ed commit 13d2663
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 1 deletion.
42 changes: 42 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,40 +47,54 @@ matrix:
name: MRI core int
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:mri:core:int
env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'

- name: MRI core fullint
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:mri:core:fullint
env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'

- name: MRI core jit
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:mri:core:jit

- name: MRI extra
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:mri:extra
env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'

- name: MRI stdlib
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:mri:stdlib
env: JRUBY_OPTS='$JRUBY_OPTS -J-Xmx1G'

- name: spec/ruby fast
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:ruby:fast

- name: spec/ruby slow
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:ruby:slow

- env: COMMAND=test/check_versions.sh
Expand All @@ -102,74 +116,102 @@ matrix:
- name: JRuby tests jit
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:jruby

- name: JRuby tests jit indy
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:jruby
env: JRUBY_OPTS=-Xcompile.invokedynamic

- name: JRuby tests aot
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:jruby:aot

- name: JRuby tests fullint
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:jruby:fullint

- name: JRuby slow tests
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake test:slow_suites

- name: JI specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:ji

- name: Compiler specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:compiler

- name: Compiler specs indy
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:compiler
env: JRUBY_OPTS=-Xcompile.invokedynamic

- name: FFI specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:ffi

- name: Regression specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:regression

- name: Regression specs jit
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:regression
env: JRUBY_OPTS=-Xjit.threshold=0

- name: JRuby specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:jruby

- name: jrubyc specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:jrubyc

- name: Profilers specs
script:
- mvn clean package -Pbootstrap
- gem install bundler
- bundle install
- jruby -S rake spec:profiler

- env: PHASE='-Pdist'
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'rspec', '3.9.0'
1 change: 0 additions & 1 deletion test/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
jar( 'org.jruby:requireTest:1.0',
:scope => 'system',
:systemPath => '${project.basedir}/jruby/requireTest-1.0.jar' )
gem 'rspec', '${rspec.version}'

overrides do
plugin( 'org.eclipse.m2e:lifecycle-mapping:1.0.0',
Expand Down

0 comments on commit 13d2663

Please sign in to comment.