summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-01-31 17:49:03 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-02-01 08:09:23 +0900
commite53af7d1fbcca4fba6e9099b2bf935dc92267607 (patch)
tree67c4a2456459c87868c3691b4fe5b47cb417a6ef
parent517d7c3221e3ca0ca76d79cc67cb9efefc01ece3 (diff)
Tweaks to freeze bundler CI
Currently some specs are broken because `rspec-mocks-3.10.3` is used, which has some breaking changes, apparently. This change makes ruby-core install the same gems installed upstream for running bundle specs, so that things never break with 3rd party releases.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5512
-rw-r--r--common.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 6fe77fba78..a6a3f2381e 100644
--- a/common.mk
+++ b/common.mk
@@ -1412,8 +1412,7 @@ yes-test-bundler-precheck: main
no-test-bundler-prepare: no-test-bundler-precheck
yes-test-bundler-prepare: yes-test-bundler-precheck
$(ACTIONS_GROUP)
- $(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
- --install-dir .bundle --conservative "rspec:~> 3.8" "rake:~> 13.0" "parallel_tests:~> 2.29"
+ $(XRUBY) -C $(srcdir) -Ilib -e 'ENV["GEM_HOME"] = File.expand_path(".bundle"); ENV["BUNDLE_APP_CONFIG"] = File.expand_path(".bundle"); ENV["BUNDLE_PATH__SYSTEM"] = "true"; ENV["BUNDLE_WITHOUT"] = "lint doc"; load "spec/bundler/support/bundle.rb"' -- install --gemfile=tool/bundler/dev_gems.rb
$(ACTIONS_ENDGROUP)
RSPECOPTS =