ruby-changes:74029
From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 20:40:10 +0900 (JST)
Subject: [ruby-changes:74029] 9fc7df7504 (ruby_3_1): merge revision(s) 464f73a5f0c1042bfefdd367b330cbdcafffca95:
https://git.ruby-lang.org/ruby.git/commit/?id=9fc7df7504 From 9fc7df7504f41a7f370e62a004c3fc0abc439295 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 16 Oct 2022 20:39:46 +0900 Subject: merge revision(s) 464f73a5f0c1042bfefdd367b330cbdcafffca95: Do not load library files from repository only for test What we want to test should be the bundled and to be installed files, but not the upstream. --- tool/test-bundled-gems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- tool/test-bundled-gems.rb | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index 6312e1872d..4fcc787dc6 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -21,7 +21,7 @@ File.foreach("#{gem_dir}/bundled_gems") do |line| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L21 next if ARGV.any? {|pat| !File.fnmatch?(pat, gem)} puts "#{github_actions ? "##[group]" : "\n"}Testing the #{gem} gem" - test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{rake} test" + test_command = "#{ruby} -C #{gem_dir}/src/#{gem} #{rake} test" first_timeout = 600 # 10min if gem == "typeprof" diff --git a/version.h b/version.h index 24268de146..973c47ab62 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 98 +#define RUBY_PATCHLEVEL 99 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/