merge revision(s) 61645: [Backport #14333]

Added bundler for `test-bundled-gems` dependency.

	  rake, did_you_mean, test-unit depends on bundler.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-02-19 06:36:03 +00:00
parent c1dc8a1354
commit f75b6d2137
2 changed files with 2 additions and 2 deletions

View file

@ -1174,7 +1174,7 @@ test-bundled-gems-fetch: $(PREP)
test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
--install-dir .bundle --conservative "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
--install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.0"
#define RUBY_RELEASE_DATE "2018-02-19"
#define RUBY_PATCHLEVEL 22
#define RUBY_PATCHLEVEL 23
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 2