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

From 377159370b3fa85ae74a86eb1003aee796e1abc7 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Tue, 1 Sep 2020 09:53:27 +0900
Subject: Revert the workaround of minitest and hoe

  86737c509cd49cfe4509a65d300d390da0f07be6
  3e1aea461320094e634ab32ca0b13dd43b69d8b0

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index d8dbaa2..c58ae3a 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -51,7 +51,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L51
         env:
           RUBY_TESTOPTS: "-q --tty=no"
           # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
-          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "rake,minitest,xmlrpc,rexml"
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rexml"
       - uses: k0kubun/action-slack@v...
         with:
           payload: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index ee391a9..87b57fa 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -73,7 +73,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L73
         env:
           RUBY_TESTOPTS: "-q --tty=no"
           # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
-          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "rake,minitest,xmlrpc"
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc"
       - uses: k0kubun/action-slack@v...
         with:
           payload: |
diff --git a/common.mk b/common.mk
index 431cfb2..990fa2c 100644
--- a/common.mk
+++ b/common.mk
@@ -1342,7 +1342,7 @@ test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare https://github.com/ruby/ruby/blob/trunk/common.mk#L1342
 no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
 yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "bundler" 'test-unit' 'rake' 'yard' 'pry' 'packnga' 'rexml'
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga' 'rexml'
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
 test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
diff --git a/gems/bundled_gems b/gems/bundled_gems
index 5b4be38..35d31f2 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -1,3 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/gems/bundled_gems#L1
+minitest 5.14.1 https://github.com/seattlerb/minitest
 power_assert 1.2.0 https://github.com/ruby/power_assert
 rake 13.0.1 https://github.com/ruby/rake
 test-unit 3.3.6 https://github.com/test-unit/test-unit
-- 
cgit v0.10.2


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