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

Hack fix for Sorbet hidden definitions update failing on Ruby 3
Homebrew · Dec 3, 2023 · 0f39516 · 0f39516
2 parents a609182 + c776379
commit 0f39516
Show file tree

Hide file tree

Showing 5 changed files with 4,673 additions and 1,628 deletions.
diff --git a/.github/workflows/sorbet.yml b/.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" ]]
+          then
+            git fetch origin
 
-          BRANCH="sorbet-files-update"
-          echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
+            BRANCH="sorbet-files-update"
+            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
+            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

diff --git a/Library/Homebrew/dev-cmd/typecheck.rb b/Library/Homebrew/dev-cmd/typecheck.rb
@@ -63,7 +63,8 @@ def self.typecheck
         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?

diff --git a/Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb b/Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb
@@ -0,0 +1,4 @@
+# typed: strict
+# frozen_string_literal: true
+
+# This file intentionally left blank