Skip to content

Commit

Permalink
Merge pull request #40 from ttwo32/fix_jruby
Browse files Browse the repository at this point in the history
Fix jruby on Travis CI
  • Loading branch information
ttwo32 authored May 2, 2017
2 parents 05cb25c + 1d8eb1f commit f73a558
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 51 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.ruby-version
coverage/
Gemfile.lock
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
env: JRUBY_OPTS=--debug
language: ruby

cache:
bundler: true

sudo: false

before_install:
- gem install bundler -v 1.14.3
- bundle --version
- gem install bundler
- bundler --version
- gem --version

script:
- make test
Expand All @@ -19,4 +24,5 @@ rvm:
- 2.2.0
- 2.3.0
- 2.4.0
- jruby-head
- ruby-head
11 changes: 6 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source 'https://rubygems.org' do
gem 'rspec', '~>3.5.0'
gem 'pry', :require => false
gem 'simplecov-rcov', :require => false
end
source 'https://rubygems.org'

gem 'rspec', '~>3.5.0'
gem 'pry', :require => false
gem 'spoon', :require => false
gem 'simplecov-rcov', :require => false
44 changes: 0 additions & 44 deletions Gemfile.lock

This file was deleted.

0 comments on commit f73a558

Please sign in to comment.