diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-09-01 09:53:27 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-09-01 11:21:41 +0900 |
| commit | 377159370b3fa85ae74a86eb1003aee796e1abc7 (patch) | |
| tree | 98df638062ec69f88fac398101e8ca8ea0953004 | |
| parent | b01d852c2add603ab51689d495fa443d32cf5909 (diff) | |
Revert the workaround of minitest and hoe
86737c509cd49cfe4509a65d300d390da0f07be6
3e1aea461320094e634ab32ca0b13dd43b69d8b0
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3493
| -rw-r--r-- | .github/workflows/macos.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ubuntu.yml | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | gems/bundled_gems | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d8dbaa2b90..c58ae3af5a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -51,7 +51,7 @@ jobs: 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@v2.0.0 with: payload: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ee391a9610..87b57fadbf 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -73,7 +73,7 @@ jobs: 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@v2.0.0 with: payload: | @@ -1342,7 +1342,7 @@ test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare 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 5b4be38264..35d31f2d01 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -1,3 +1,4 @@ +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 |