aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2020-09-17 21:23:39 +0900
committernagachika <nagachika@ruby-lang.org>2020-09-17 21:23:39 +0900
commiteb8270d67596fff58e245ff4227dd35e67dbef5c (patch)
tree5c6f52dce757168e681f31431030a9dbf211cf1e
parent0ebf6ea9a0d74f859ee4009fbe6693996f1fcdc7 (diff)
downloadruby-eb8270d67596fff58e245ff4227dd35e67dbef5c.tar.gz
Skip bundler spec using irb with simulated JRuby environment.
-rw-r--r--spec/bundler/other/platform_spec.rb1
-rw-r--r--version.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/bundler/other/platform_spec.rb b/spec/bundler/other/platform_spec.rb
index 8b02505ad8..9f25637622 100644
--- a/spec/bundler/other/platform_spec.rb
+++ b/spec/bundler/other/platform_spec.rb
@@ -954,6 +954,7 @@ G
end
it "starts IRB with the default group loaded when ruby version matches any engine" do
+ skip "irb depend on JRuby.compile_ir and don't work in simulated environment." unless RUBY_ENGINE == "jruby"
simulate_ruby_engine "jruby" do
gemfile <<-G
source "#{file_uri_for(gem_repo1)}"
diff --git a/version.h b/version.h
index 60886ef9ca..d268146e51 100644
--- a/version.h
+++ b/version.h
@@ -2,11 +2,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 126
+#define RUBY_PATCHLEVEL 127
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
#include "ruby/version.h"