Skip to content

Commit

Permalink
Only run 1.8.7 with a specific Gemfile for Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbegin committed Jan 6, 2016
1 parent 127cf5a commit 4af8201
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- 2.0.0
Expand All @@ -9,14 +8,19 @@ rvm:
- 2.3.0
- rbx-2
- ruby-head
- ree
- jruby-9.0.0.0
- jruby-9.0.1.0
- jruby-18mode
- jruby-19mode
- jruby
- jruby-head
matrix:
include:
- rvm: 1.8.7
gemfile: ruby1.8.7.gemfile
- rvm: ree
gemfile: ruby1.8.7.gemfile
- rvm: jruby-18mode
gemfile: ruby1.8.7.gemfile
allow_failures:
- rvm: jruby-9.0.0.0
- rvm: jruby-18mode
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
source 'http://rubygems.org/'

gemspec

gem 'addressable', '>= 2.3.6'

if ENV["EM_HTTP_REQUEST_0_X"]
gem 'em-http-request', '~> 0.3.0'
end
Expand Down
22 changes: 22 additions & 0 deletions ruby1.8.7.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
source 'http://rubygems.org/'

gemspec

gem 'addressable', '< 2.3.6'

if ENV["EM_HTTP_REQUEST_0_X"]
gem 'em-http-request', '~> 0.3.0'
end

group :development do
gem 'rake'
end

group :test do
gem 'minitest_tu_shim', '1.3.2'
end

platforms :jruby do
gem 'jruby-openssl'
end

1 change: 0 additions & 1 deletion webmock.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Gem::Specification.new do |s|
patron_version = (RUBY_VERSION <= '1.8.7') ? '0.4.18' : '>= 0.4.18'
manticore_version = (RUBY_VERSION) > '1.8.7' ? '>= 0.5.1' : '<= 0.5.1'

s.add_dependency 'addressable', '>= 2.3.6'
s.add_dependency 'crack', '>=0.3.2'
s.add_dependency 'hashdiff'

Expand Down

0 comments on commit 4af8201

Please sign in to comment.