ruby-changes:74196
From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 22:52:34 +0900 (JST)
Subject: [ruby-changes:74196] 29414e004f (ruby_3_1): merge revision(s) 232e2f598103c8eda37d08913665b72b6f787e3f:
https://git.ruby-lang.org/ruby.git/commit/?id=29414e004f From 29414e004f6d84f35f2619bc05a2619ecb093908 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Fri, 21 Oct 2022 22:47:30 +0900 Subject: merge revision(s) 232e2f598103c8eda37d08913665b72b6f787e3f: Skip TupleSpaceProxyTest on MINGW64 too It wasn't specific to UCRT64 https://github.com/ruby/ruby/runs/7062992464 --- test/rinda/test_rinda.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- test/rinda/test_rinda.rb | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index c23e452bdc..84421a8e5e 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -496,7 +496,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L496 include TupleSpaceTestModule def setup - if RUBY_PLATFORM.match?(/mingw/) && ENV['MSYSTEM'] == 'UCRT64' + if RUBY_PLATFORM.match?(/mingw/) @omitted = true omit 'This test seems to randomly hang on GitHub Actions MinGW UCRT64' end diff --git a/version.h b/version.h index 5927aa1d8e..d045733904 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 161 +#define RUBY_PATCHLEVEL 162 #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/