diff options
| author | Miklós Fazekas <mfazekas@szemafor.com> | 2016-07-23 21:34:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 21:34:38 +0200 |
| commit | 4a2ec61955b06377b4cc1c78ebfa62f3067d2145 (patch) | |
| tree | 984aa07fe10f2d3444dca8d50fcbc11ef58309b8 | |
| parent | 6995dce28d3eeb5595c999ca65cd4ebb2fb897f0 (diff) | |
| parent | a5362e443021fa46554bd69e4c2b796d18179df8 (diff) | |
| download | net-ssh-4a2ec61955b06377b4cc1c78ebfa62f3067d2145.tar.gz | |
Merge pull request #410 from mfazekas/try-jruby-9.1.2.0v4.0.0.beta1
Try jruby 9.1.2.0
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | net-ssh.gemspec | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index a169925..2c55e95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: - 2.1 - 2.2 - 2.3.0 - - jruby-9.0.5.0 + - jruby-9.1.2.0 - rbx-3.25 - ruby-head env: @@ -16,16 +16,16 @@ env: matrix: exclude: - rvm: rbx-3.25 - - rvm: jruby-9.0.5.0 + - rvm: jruby-9.1.2.0 include: - rvm: rbx-3.25 env: NET_SSH_RUN_INTEGRATION_TESTS= - - rvm: jruby-9.0.5.0 + - rvm: jruby-9.1.2.0 env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false' NET_SSH_RUN_INTEGRATION_TESTS= + fast_finish: true allow_failures: - - rvm: ruby-head - rvm: rbx-3.25 - - rvm: jruby-9.0.5.0 + - rvm: jruby-9.1.2.0 install: - export JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false' @@ -1,5 +1,4 @@ source 'https://rubygems.org' -gem 'byebug' # Specify your gem's dependencies in mygem.gemspec gemspec
\ No newline at end of file diff --git a/net-ssh.gemspec b/net-ssh.gemspec index 5e621bb..034f74a 100644 --- a/net-ssh.gemspec +++ b/net-ssh.gemspec @@ -39,6 +39,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "minitest", "~> 5.0" spec.add_development_dependency "rubocop", "~> 0.39.0" spec.add_development_dependency "mocha", ">= 1.1.0" + spec.add_development_dependency("byebug") if RUBY_ENGINE == "ruby" spec.add_dependency('jruby-pageant', '>= 1.1.1') if RUBY_PLATFORM == 'jruby' end |