Skip to content

Commit 0091846

Browse files
authored
Merge branch 'master' into portable-ruby-3.3.8
2 parents 053e342 + 1d140e5 commit 0091846

File tree

142 files changed

+210
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+210
-214
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: vale docs/
5353

5454
- name: Install Ruby
55-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
55+
uses: ruby/setup-ruby@e5ac7b085f6e63d49c8973eb0c6e04d876b881f1 # v1.230.0
5656
with:
5757
bundler-cache: true
5858
working-directory: docs

.github/workflows/rubydoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
persist-credentials: false
4343

4444
- name: Install Ruby
45-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
45+
uses: ruby/setup-ruby@e5ac7b085f6e63d49c8973eb0c6e04d876b881f1 # v1.230.0
4646
with:
4747
bundler-cache: true
4848
working-directory: rubydoc

Library/Homebrew/Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
base64 (0.2.0)
88
benchmark (0.4.0)
99
bigdecimal (3.1.9)
10-
bindata (2.5.0)
10+
bindata (2.5.1)
1111
coderay (1.1.3)
1212
concurrent-ruby (1.3.5)
1313
diff-lcs (1.6.1)
@@ -88,7 +88,7 @@ GEM
8888
rubocop-ast (>= 1.44.0, < 2.0)
8989
ruby-progressbar (~> 1.7)
9090
unicode-display_width (>= 2.4.0, < 4.0)
91-
rubocop-ast (1.44.0)
91+
rubocop-ast (1.44.1)
9292
parser (>= 3.3.7.2)
9393
prism (~> 1.4)
9494
rubocop-md (2.0.0)
@@ -121,15 +121,15 @@ GEM
121121
simplecov-html (0.13.1)
122122
simplecov_json_formatter (0.1.4)
123123
simpleidn (0.2.3)
124-
sorbet (0.5.12003)
125-
sorbet-static (= 0.5.12003)
126-
sorbet-runtime (0.5.12003)
127-
sorbet-static (0.5.12003-aarch64-linux)
128-
sorbet-static (0.5.12003-universal-darwin)
129-
sorbet-static (0.5.12003-x86_64-linux)
130-
sorbet-static-and-runtime (0.5.12003)
131-
sorbet (= 0.5.12003)
132-
sorbet-runtime (= 0.5.12003)
124+
sorbet (0.5.12010)
125+
sorbet-static (= 0.5.12010)
126+
sorbet-runtime (0.5.12010)
127+
sorbet-static (0.5.12010-aarch64-linux)
128+
sorbet-static (0.5.12010-universal-darwin)
129+
sorbet-static (0.5.12010-x86_64-linux)
130+
sorbet-static-and-runtime (0.5.12010)
131+
sorbet (= 0.5.12010)
132+
sorbet-runtime (= 0.5.12010)
133133
spoom (1.6.1)
134134
erubi (>= 1.10.0)
135135
prism (>= 0.28.0)

Library/Homebrew/extend/os/mac/diagnostic.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,13 @@ def check_for_opencore
145145
return
146146
end
147147

148+
oclp_support_tier = Hardware::CPU.features.include?(:pclmulqdq) ? 2 : 3
149+
148150
<<~EOS
149151
You have booted macOS using OpenCore Legacy Patcher.
150152
We do not provide support for this configuration.
151153
152-
#{support_tier_message(tier: 2)}
154+
#{support_tier_message(tier: oclp_support_tier)}
153155
EOS
154156
end
155157

Library/Homebrew/extend/os/mac/hardware/cpu.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def in_rosetta2?
4040
::Hardware::CPU.sysctl_bool("sysctl.proc_translated")
4141
end
4242

43-
def features
43+
def self.features
4444
@features ||= ::Hardware::CPU.sysctl_n(
4545
"machdep.cpu.features",
4646
"machdep.cpu.extfeatures",

Library/Homebrew/formula_cellar_checks.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ def check_cpuid_instruction(formula)
320320
return unless dot_brew_formula.exist?
321321

322322
return unless dot_brew_formula.read.include? "ENV.runtime_cpu_detection"
323+
return if formula.tap&.audit_exception(:no_cpuid_allowlist, formula.name)
323324

324325
# macOS `objdump` is a bit slow, so we prioritise llvm's `llvm-objdump` (~5.7x faster)
325326
# or binutils' `objdump` (~1.8x faster) if they are installed.
Lines changed: 10 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)