Merge branch 'Homebrew:master' into master

.github/workflows/tests.yml

@@ -326,7 +326,6 @@ jobs:
         if: matrix.ruby
         run: |
           echo "HOMEBREW_USE_RUBY_FROM_PATH=1" >> "${GITHUB_ENV}"
-          echo "HOMEBREW_BOOTSNAP=" >> "${GITHUB_ENV}" # Unsupported, for now
           rm -rf "${{ steps.set-up-homebrew.outputs.repository-path }}/Library/Homebrew/vendor/portable-ruby"
 
       - run: brew config

Library/Homebrew/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     bindata (2.4.15)
-    bootsnap (1.16.0)
+    bootsnap (1.17.0)
       msgpack (~> 1.2)
     byebug (11.1.3)
     coderay (1.1.3)

Library/Homebrew/sorbet/rbi/gems/bootsnap@1.17.0.rbi

@@ -25,14 +25,12 @@ end
 
 module Bootsnap::CompileCache
   class << self
-    def permission_error(path); end
     def setup(cache_dir:, iseq:, yaml:, json:, readonly: T.unsafe(nil)); end
     def supported?; end
   end
 end
 
 class Bootsnap::CompileCache::Error < ::StandardError; end
-class Bootsnap::CompileCache::PermissionError < ::Bootsnap::CompileCache::Error; end
 Bootsnap::CompileCache::UNCOMPILABLE = T.let(T.unsafe(nil), BasicObject)
 
 module Bootsnap::ExplicitRequire
@@ -100,12 +98,14 @@ module Bootsnap::LoadPathCache::ChangeObserver::ArrayMixin
   def []=(*args, &block); end
   def append(*entries); end
   def clear(*args, &block); end
+  def clone; end
   def collect!(*args, &block); end
   def compact!(*args, &block); end
   def concat(entries); end
   def delete(*args, &block); end
   def delete_at(*args, &block); end
   def delete_if(*args, &block); end
+  def dup; end
   def fill(*args, &block); end
   def flatten!(*args, &block); end
   def insert(*args, &block); end

Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi

@@ -125,6 +125,10 @@ module Bootsnap::LoadPathCache
   DLEXT2 = ::T.let(nil, ::T.untyped)
 end
 
+class Bootsnap::LoadPathCache::Cache
+  TRUFFLERUBY_LIB_DIR_PREFIX = ::T.let(nil, ::T.untyped)
+end
+
 class BottleSpecification
   extend ::T::Private::Methods::MethodHooks
   extend ::T::Private::Methods::SingletonMethodHooks
@@ -5565,6 +5569,8 @@ end
 class Net::HTTPRangeNotSatisfiable
 end
 
+Net::HTTPRedirection::EXCEPTION_TYPE = Net::HTTPRetriableError
+
 Net::HTTPRedirectionCode = Net::HTTPRedirection
 
 Net::HTTPRequestURITooLarge = Net::HTTPURITooLong
@@ -5579,13 +5585,9 @@ Net::HTTPServerErrorCode = Net::HTTPServerError
 
 Net::HTTPSession = Net::HTTP
 
-class Net::HTTPSuccess
+Net::HTTPSuccess::EXCEPTION_TYPE = Net::HTTPError
-end
 
-Net::HTTPSuccessCode::EXCEPTION_TYPE = Net::HTTPError
+Net::HTTPSuccessCode = Net::HTTPSuccess
-
-class Net::HTTPSuccess
-end
 
 class Net::HTTPURITooLong
   HAS_BODY = ::T.let(nil, ::T.untyped)

Library/Homebrew/startup/bootsnap.rb

@@ -3,9 +3,7 @@
 
 # Disable Rails cops, as we haven't required active_support yet.
 # rubocop:disable Rails
-homebrew_bootsnap_enabled = ENV["HOMEBREW_NO_BOOTSNAP"].nil? &&
+homebrew_bootsnap_enabled = ENV["HOMEBREW_NO_BOOTSNAP"].nil? && !ENV["HOMEBREW_BOOTSNAP"].nil?
-                            !ENV["HOMEBREW_BOOTSNAP"].nil? &&
-                            ENV["HOMEBREW_RUBY3"].nil?
 
 # we need some development tools to build bootsnap native code
 homebrew_bootsnap_enabled &&= if ENV["HOMEBREW_MACOS_VERSION"]
@@ -32,8 +30,17 @@ if homebrew_bootsnap_enabled
     cache = ENV.fetch("HOMEBREW_CACHE", nil) || ENV.fetch("HOMEBREW_DEFAULT_CACHE", nil)
     raise "Needs HOMEBREW_CACHE or HOMEBREW_DEFAULT_CACHE!" if cache.nil? || cache.empty?
 
+    # We never do `require "vendor/bundle/ruby/..."` or `require "vendor/portable-ruby/..."`,
+    # so let's slim the cache a bit by excluding them.
+    # Note that gems within `bundle/ruby` will still be cached - these are when directory walking down from above.
+    ignore_directories = [
+      (HOMEBREW_LIBRARY_PATH/"vendor/bundle/ruby").to_s,
+      (HOMEBREW_LIBRARY_PATH/"vendor/portable-ruby").to_s,
+    ]
+
     Bootsnap.setup(
       cache_dir:          cache,
+      ignore_directories: ignore_directories,
       load_path_cache:    true,
       compile_cache_iseq: true,
       compile_cache_yaml: true,

Library/Homebrew/vendor/bundle/bundler/setup.rb

@@ -39,8 +39,8 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bindata-2.4.15/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/msgpack-1.7.2")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/msgpack-1.7.2/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/bootsnap-1.16.0")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/bootsnap-1.17.0")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bootsnap-1.16.0/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bootsnap-1.17.0/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/byebug-11.1.3")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/byebug-11.1.3/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/coderay-1.1.3/lib")