ruby-changes:72710
From: nagachika <ko1@a...>
Date: Wed, 27 Jul 2022 22:56:37 +0900 (JST)
Subject: [ruby-changes:72710] 9b9704f9dc (ruby_3_1): merge revision(s) 456e1d1eaa9bb11adaed1acde488d7da3c88704b:
https://git.ruby-lang.org/ruby.git/commit/?id=9b9704f9dc From 9b9704f9dc152c02b5baf370cf62923b07cb6072 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Wed, 27 Jul 2022 22:55:52 +0900 Subject: merge revision(s) 456e1d1eaa9bb11adaed1acde488d7da3c88704b: Try the tag without "v" prefix to checkout upstream repositories --- gems/bundled_gems | 4 ++-- tool/fetch-bundled_gems.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- gems/bundled_gems | 4 ++-- tool/fetch-bundled_gems.rb | 2 +- version.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gems/bundled_gems b/gems/bundled_gems index 3b954154a8..0d95b9e75c 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -2,9 +2,9 @@ https://github.com/ruby/ruby/blob/trunk/gems/bundled_gems#L2 minitest 5.15.0 https://github.com/seattlerb/minitest power_assert 2.0.1 https://github.com/ruby/power_assert rake 13.0.6 https://github.com/ruby/rake -test-unit 3.5.3 https://github.com/test-unit/test-unit 3.5.3 +test-unit 3.5.3 https://github.com/test-unit/test-unit rexml 3.2.5 https://github.com/ruby/rexml -rss 0.2.9 https://github.com/ruby/rss 0.2.9 +rss 0.2.9 https://github.com/ruby/rss net-ftp 0.1.3 https://github.com/ruby/net-ftp net-imap 0.2.3 https://github.com/ruby/net-imap net-pop 0.1.1 https://github.com/ruby/net-pop diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb index ebb70e88f9..12d6f3d9cd 100755 --- a/tool/fetch-bundled_gems.rb +++ b/tool/fetch-bundled_gems.rb @@ -23,5 +23,5 @@ c = r || "v#{v}" https://github.com/ruby/ruby/blob/trunk/tool/fetch-bundled_gems.rb#L23 checkout = %w"git -c advice.detachedHead=false checkout" puts "checking out #{c} (v=#{v}, r=#{r}) ..." unless system(*checkout, c, "--", chdir: n) - abort + abort if r or !system(*checkout, v, "--", chdir: n) end diff --git a/version.h b/version.h index 13062dd7d2..b1b97588de 100644 --- a/version.h +++ b/version.h @@ -11,11 +11,11 @@ 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 40 +#define RUBY_PATCHLEVEL 41 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/