Merge pull request #16281 from Bo98/ruby3-hidden-defs-fix

Hack fix for Sorbet hidden definitions update failing on Ruby 3

.github/workflows/sorbet.yml

@@ -47,17 +47,20 @@ jobs:
         id: update
         working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}
         run: |
-          git fetch origin
+          if [[ "${GITHUB_EVENT_NAME}" != "pull_request" ]]
-
-          BRANCH="sorbet-files-update"
-          echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
-
-          if git ls-remote --exit-code --heads origin "${BRANCH}"
           then
-            git checkout "${BRANCH}"
+            git fetch origin
-            git checkout "Library/Homebrew/sorbet"
+
-          else
+            BRANCH="sorbet-files-update"
-            git checkout --no-track -B "${BRANCH}" origin/master
+            echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
+
+            if git ls-remote --exit-code --heads origin "${BRANCH}"
+            then
+              git checkout "${BRANCH}"
+              git checkout "Library/Homebrew/sorbet"
+            else
+              git checkout --no-track -B "${BRANCH}" origin/master
+            fi
           fi
 
           brew typecheck --update --suggest-typed

Library/Homebrew/dev-cmd/typecheck.rb

@@ -63,7 +63,8 @@ module Homebrew
         ohai "Updating Tapioca RBI files..."
         safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args
         safe_system "bundle", "exec", "parlour"
-        safe_system "bundle", "exec", "srb", "rbi", "hidden-definitions"
+        safe_system({ "RUBYLIB" => "#{HOMEBREW_LIBRARY_PATH}/sorbet/hidden_definitions_hacks" },
+                    "bundle", "exec", "srb", "rbi", "hidden-definitions")
         safe_system "bundle", "exec", "tapioca", "todo"
 
         if args.suggest_typed?

Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb

@@ -0,0 +1,4 @@
+# typed: strict
+# frozen_string_literal: true
+
+# This file intentionally left blank

Library/Homebrew/sorbet/rbi/todo.rbi

@@ -5,6 +5,7 @@
 # typed: false
 
 module ::Nokogiri; end
+module BigDecimal::Deprecation; end
 module T::InterfaceWrapper::Helpers; end
 module T::Private::Abstract::Hooks; end
 module T::Private::Methods::MethodHooks; end