[前][次][番号順一覧][スレッド一覧]

ruby-changes:73873

From: nagachika <ko1@a...>
Date: Thu, 6 Oct 2022 19:49:44 +0900 (JST)
Subject: [ruby-changes:73873] d2f4cbf042 (ruby_3_1): merge revision(s) 5101671cbc008230cae7b5c2190b2f6938a19f74:

https://git.ruby-lang.org/ruby.git/commit/?id=d2f4cbf042

From d2f4cbf04215e536bcd06fde9cc7cec3b5566707 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Thu, 6 Oct 2022 19:49:21 +0900
Subject: merge revision(s) 5101671cbc008230cae7b5c2190b2f6938a19f74:

	Disable parallel built in test-bundled-gems

	---
	 common.mk                 | 2 +-
	 tool/test-bundled-gems.rb | 2 ++
	 2 files changed, 3 insertions(+), 1 deletion(-)
---
 tool/test-bundled-gems.rb | 2 ++
 version.h                 | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index b70576103a..f130301ffd 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -2,6 +2,8 @@ require 'rbconfig' https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L2
 require 'timeout'
 require 'fileutils'
 
+ENV.delete("GNUMAKEFLAGS")
+
 github_actions = ENV["GITHUB_ACTIONS"] == "true"
 
 allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || ''
diff --git a/version.h b/version.h
index 0a983c31a2..68bdecbcf0 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 70
+#define RUBY_PATCHLEVEL 71
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]