Skip to content

Commit

Permalink
Merge pull request #541 from olleolleolle/patch-1
Browse files Browse the repository at this point in the history
CI: Using default script directive, allow Bundler to pick the gems needed
  • Loading branch information
leejarvis authored Feb 12, 2019
2 parents a6cbd57 + 0d0cc43 commit d4880d3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@ notifications:
- ljjarvis@gmail.com
- knu@idaemons.org

# bundler is missing for jruby-head in travis-ci
# https://github.com/travis-ci/travis-ci/issues/5861
before_install:
- gem install --conservative bundler -v'1.13.7'

script: rake test
- gem install --conservative bundler -v'< 2'

matrix:
include:
Expand Down
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
source 'https://rubygems.org'

# In order to be able to install on 1.9.3 and 2.0.0
ruby RUBY_VERSION
gem "rake"
gem "bundler"
gem "rdoc"
gem "minitest"

gemspec
5 changes: 0 additions & 5 deletions mechanize.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,4 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency "ntlm-http", [ ">= 0.1.1", "~> 0.1" ]
spec.add_runtime_dependency "webrobots", [ "< 0.2", ">= 0.0.9" ]
spec.add_runtime_dependency "domain_name", [ ">= 0.5.1", "~> 0.5" ]

spec.add_development_dependency "rake"
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rdoc", "~> 4.0"
spec.add_development_dependency "minitest", "~> 5.0"
end

0 comments on commit d4880d3

Please sign in to comment.