admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
Hack fix for Sorbet hidden definitions update failing on Ruby 3
This commit is contained in:
Kevin 2023-12-03 10:36:31 -08:00 committed by GitHub
commit 0f39516cf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4214 additions and 1169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/sorbet.yml vendored
View File

@ -47,6 +47,8 @@ jobs:
id: update id: update
working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }} working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}
run: | run: |
if [[ "${GITHUB_EVENT_NAME}" != "pull_request" ]]
then
git fetch origin git fetch origin
BRANCH="sorbet-files-update" BRANCH="sorbet-files-update"
@ -59,6 +61,7 @@ jobs:
else else
git checkout --no-track -B "${BRANCH}" origin/master git checkout --no-track -B "${BRANCH}" origin/master
fi fi
fi
brew typecheck --update --suggest-typed brew typecheck --update --suggest-typed

3
Library/Homebrew/dev-cmd/typecheck.rb
View File

@ -63,7 +63,8 @@ module Homebrew
ohai "Updating Tapioca RBI files..." ohai "Updating Tapioca RBI files..."
safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args
safe_system "bundle", "exec", "parlour" 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" safe_system "bundle", "exec", "tapioca", "todo"
if args.suggest_typed? if args.suggest_typed?

4
Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb Normal file
View File

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

5352
Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi
View File

File diff suppressed because it is too large Load Diff

1
Library/Homebrew/sorbet/rbi/todo.rbi
View File

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