File tree Expand file tree Collapse file tree 3 files changed +13
-6
lines changed
Expand file tree Collapse file tree 3 files changed +13
-6
lines changed Original file line number Diff line number Diff line change 8181 run : bundle install --help | grep -q BUNDLE-INSTALL
8282 - name : Check bundler fallback man pages are properly picked up
8383 run : sudo rm $(which man) && bundle install --help
84+ - name : Install older bundler
85+ run : gem install bundler:2.6.9
86+ - name : Run older bundler without warnings
87+ run : |
88+ BUNDLER_VERSION=2.6.9 ruby -rbundler/setup -e1 2> errors.txt || (cat errors.txt && exit 1)
89+ test ! -s errors.txt || (cat errors.txt && exit 1)
8490 - name : Build bundler
8591 run : gem build bundler.gemspec
8692 working-directory : ./bundler
Original file line number Diff line number Diff line change @@ -640,9 +640,8 @@ def self.load_safe_marshal
640640 # Load Bundler extensions to RubyGems, making sure to avoid redefinition
641641 # warnings in platform constants
642642
643- def self . load_bundler_extensions
644- require "bundler/version"
645- return if Bundler ::VERSION >= "2.6.9"
643+ def self . load_bundler_extensions ( version )
644+ return unless version <= "2.6.9"
646645
647646 previous_platforms = { }
648647
@@ -1169,7 +1168,6 @@ def self.use_gemdeps(path = nil)
11691168
11701169 ENV [ "BUNDLE_GEMFILE" ] ||= File . expand_path ( path )
11711170 require_relative "rubygems/user_interaction"
1172- Gem . load_bundler_extensions
11731171 require "bundler"
11741172 begin
11751173 Gem ::DefaultUserInteraction . use_ui ( ui ) do
Original file line number Diff line number Diff line change @@ -64,8 +64,11 @@ def require(path) # :doc:
6464 rp
6565 end
6666
67- Kernel . send ( :gem , name , Gem ::Requirement . default_prerelease ) unless
68- resolved_path
67+ next if resolved_path
68+
69+ Kernel . send ( :gem , name , Gem ::Requirement . default_prerelease )
70+
71+ Gem . load_bundler_extensions ( Gem . loaded_specs [ name ] . version ) if name == "bundler"
6972
7073 next
7174 end
You can’t perform that action at this time.
0 commit comments