diff --git a/docs/GitHub/Actions.html b/docs/GitHub/Actions.html index 2a3ebf26e..495e1b691 100644 --- a/docs/GitHub/Actions.html +++ b/docs/GitHub/Actions.html @@ -546,7 +546,9 @@

52 53 54 -55 +55 +56 +57 
# File 'utils/github/actions.rb', line 50
@@ -554,8 +556,10 @@ 

 def self.puts_annotation_if_env_set(type, message, file: nil, line: nil)
   # Don't print annotations during tests, too messy to handle these.
   return if ENV.fetch("HOMEBREW_TESTS", false)
+  return unless env_set?
 
-  puts Annotation.new(type, message) if env_set?
+  std = (type == :notice) ? $stdout : $stderr
+  std.puts Annotation.new(type, message)
 end
diff --git a/docs/GitHub/Actions/Annotation.html b/docs/GitHub/Actions/Annotation.html index 379ac56e6..33aeea200 100644 --- a/docs/GitHub/Actions/Annotation.html +++ b/docs/GitHub/Actions/Annotation.html @@ -386,8 +386,6 @@ 

 
 
-82
-83
 84
 85
 86
@@ -397,10 +395,12 @@ 

 90
 91
 92
-93
+93 +94 +95 - 
# File 'utils/github/actions.rb', line 82
+      
# File 'utils/github/actions.rb', line 84
 
 def initialize(type, message, file: nil, title: nil, line: nil, end_line: nil, column: nil, end_column: nil)
   raise ArgumentError, "Unsupported type: #{type.inspect}" if ANNOTATION_TYPES.exclude?(type)
@@ -483,16 +483,16 @@ 

       
 
 
-62
-63
 64
 65
 66
 67
-68

+68
+69
+70

     
     
-      
# File 'utils/github/actions.rb', line 62
+      
# File 'utils/github/actions.rb', line 64
 
 def self.path_relative_to_workspace(path)
   workspace = Pathname(ENV.fetch("GITHUB_WORKSPACE", Dir.pwd)).realpath
@@ -556,14 +556,14 @@ 

       
 
 
-120
-121
 122
 123
-124

+124
+125
+126

     
     
-      
# File 'utils/github/actions.rb', line 120
+      
# File 'utils/github/actions.rb', line 122
 
 def relevant?
   return true if @file.blank?
diff --git a/docs/Kernel.html b/docs/Kernel.html
index 5ca0f70e3..0525fab51 100644
--- a/docs/Kernel.html
+++ b/docs/Kernel.html
@@ -954,6 +954,7 @@ 

       
 
 
+442
 443
 444
 445
@@ -974,11 +975,10 @@ 

 460
 461
 462
-463
-464

+463

     
     
-      
# File 'extend/kernel.rb', line 443
+      
# File 'extend/kernel.rb', line 442
 
 def disk_usage_readable(size_in_bytes)
   if size_in_bytes >= 1_073_741_824
@@ -1037,6 +1037,7 @@ 

       
 
 
+422
 423
 424
 425
@@ -1050,11 +1051,10 @@ 

 433
 434
 435
-436
-437

+436

     
     
-      
# File 'extend/kernel.rb', line 423
+      
# File 'extend/kernel.rb', line 422
 
 def ensure_executable!(name, formula_name = nil, reason: "")
   formula_name ||= name
@@ -1107,6 +1107,7 @@ 

       
 
 
+383
 384
 385
 386
@@ -1142,11 +1143,10 @@ 

 416
 417
 418
-419
-420

+419

     
     
-      
# File 'extend/kernel.rb', line 384
+      
# File 'extend/kernel.rb', line 383
 
 def ensure_formula_installed!(formula_or_name, reason: "", latest: false,
                               output_to_stderr: true, quiet: false)
@@ -1219,6 +1219,7 @@ 

       
 
 
+334
 335
 336
 337
@@ -1228,11 +1229,10 @@ 

 341
 342
 343
-344
-345

+344

     
     
-      
# File 'extend/kernel.rb', line 335
+      
# File 'extend/kernel.rb', line 334
 
 def exec_browser(*args)
   browser = Homebrew::EnvConfig.browser
@@ -1279,13 +1279,13 @@ 

       
 
 
+329
 330
 331
-332
-333

+332

     
     
-      
# File 'extend/kernel.rb', line 330
+      
# File 'extend/kernel.rb', line 329
 
 def exec_editor(*args)
   puts "Editing #{args.join "\n"}"
@@ -1325,6 +1325,7 @@ 

       
 
 
+346
 347
 348
 349
@@ -1348,11 +1349,10 @@ 

 367
 368
 369
-370
-371

+370

     
     
-      
# File 'extend/kernel.rb', line 347
+      
# File 'extend/kernel.rb', line 346
 
 def ignore_interrupts(_opt = nil)
   # rubocop:disable Style/GlobalVars
@@ -1413,6 +1413,7 @@ 

       
 
 
+232
 233
 234
 235
@@ -1429,11 +1430,10 @@ 

 246
 247
 248
-249
-250

+249

     
     
-      
# File 'extend/kernel.rb', line 233
+      
# File 'extend/kernel.rb', line 232
 
 def interactive_shell(formula = nil)
   unless formula.nil?
@@ -1487,14 +1487,14 @@ 

       
 
 
+465
 466
 467
 468
-469
-470

+469

     
     
-      
# File 'extend/kernel.rb', line 466
+      
# File 'extend/kernel.rb', line 465
 
 def number_readable(number)
   numstr = number.to_i.to_s
@@ -1673,8 +1673,7 @@ 

 174
 175
 176
-177
-178

+177

     
     
       
# File 'extend/kernel.rb', line 102
@@ -1746,7 +1745,6 @@ 

 
   disable = true if disable_for_developers && Homebrew::EnvConfig.developer?
   if disable || Homebrew.raise_deprecation_exceptions?
-    puts GitHub::Actions::Annotation.new(:error, message, file:, line:) if GitHub::Actions.env_set?
     GitHub::Actions.puts_annotation_if_env_set(:error, message, file:, line:)
     exception = MethodDeprecatedError.new(message)
     exception.set_backtrace(backtrace)
@@ -1860,14 +1858,14 @@ 

       
 
 
+179
 180
 181
 182
-183
-184

+183

     
     
-      
# File 'extend/kernel.rb', line 180
+      
# File 'extend/kernel.rb', line 179
 
 def odisabled(method, replacement = nil, **options)
   options = { disable: true, caller: }.merge(options)
@@ -2293,12 +2291,12 @@ 

       
 
 
+438
 439
-440
-441

+440

     
     
-      
# File 'extend/kernel.rb', line 439
+      
# File 'extend/kernel.rb', line 438
 
 def paths
   @paths ||= ORIGINAL_PATHS.uniq.map(&:to_s)
@@ -2337,6 +2335,7 @@ 

       
 
 
+215
 216
 217
 218
@@ -2351,11 +2350,10 @@ 

 227
 228
 229
-230
-231

+230

     
     
-      
# File 'extend/kernel.rb', line 216
+      
# File 'extend/kernel.rb', line 215
 
 def pretty_duration(seconds)
   seconds = seconds.to_i
@@ -2407,6 +2405,7 @@ 

       
 
 
+185
 186
 187
 188
@@ -2414,11 +2413,10 @@ 

 190
 191
 192
-193
-194

+193

     
     
-      
# File 'extend/kernel.rb', line 186
+      
# File 'extend/kernel.rb', line 185
 
 def pretty_installed(formula)
   if !$stdout.tty?
@@ -2463,6 +2461,7 @@ 

       
 
 
+195
 196
 197
 198
@@ -2470,11 +2469,10 @@ 

 200
 201
 202
-203
-204

+203

     
     
-      
# File 'extend/kernel.rb', line 196
+      
# File 'extend/kernel.rb', line 195
 
 def pretty_outdated(formula)
   if !$stdout.tty?
@@ -2519,6 +2517,7 @@ 

       
 
 
+205
 206
 207
 208
@@ -2526,11 +2525,10 @@ 

 210
 211
 212
-213
-214

+213

     
     
-      
# File 'extend/kernel.rb', line 206
+      
# File 'extend/kernel.rb', line 205
 
 def pretty_uninstalled(formula)
   if !$stdout.tty?
@@ -2576,17 +2574,17 @@ 

       
 
 
+269
 270
 271
 272
 273
 274
 275
-276
-277

+276

     
     
-      
# File 'extend/kernel.rb', line 270
+      
# File 'extend/kernel.rb', line 269
 
 def quiet_system(cmd, *args)
   Homebrew._system(cmd, *args) do
@@ -2630,14 +2628,14 @@ 

       
 
 
+546
 547
 548
 549
-550
-551

+550

     
     
-      
# File 'extend/kernel.rb', line 547
+      
# File 'extend/kernel.rb', line 546
 
 def redact_secrets(input, secrets)
   secrets.compact
@@ -2678,17 +2676,17 @@ 

       
 
 
+372
 373
 374
 375
 376
 377
 378
-379
-380

+379

     
     
-      
# File 'extend/kernel.rb', line 373
+      
# File 'extend/kernel.rb', line 372
 
 def redirect_stdout(file)
   out = $stdout.dup
@@ -2815,14 +2813,14 @@ 

       
 
 
+260
 261
 262
 263
-264
-265

+264

     
     
-      
# File 'extend/kernel.rb', line 261
+      
# File 'extend/kernel.rb', line 260
 
 def safe_system(cmd, *args, **options)
   return if Homebrew.system(cmd, *args, **options)
@@ -2863,6 +2861,7 @@ 

       
 
 
+534
 535
 536
 537
@@ -2872,11 +2871,10 @@ 

 541
 542
 543
-544
-545

+544

     
     
-      
# File 'extend/kernel.rb', line 535
+      
# File 'extend/kernel.rb', line 534
 
 def tap_and_name_comparison
   proc do |a, b|
@@ -2927,6 +2925,7 @@ 

       
 
 
+475
 476
 477
 478
@@ -2952,11 +2951,10 @@ 

 498
 499
 500
-501
-502

+501

     
     
-      
# File 'extend/kernel.rb', line 476
+      
# File 'extend/kernel.rb', line 475
 
 def truncate_text_to_approximate_size(str, max_bytes, options = {})
   front_weight = options.fetch(:front_weight, 0.5)
@@ -3015,6 +3013,7 @@ 

       
 
 
+281
 282
 283
 284
@@ -3026,11 +3025,10 @@ 

 290
 291
 292
-293
-294

+293

     
     
-      
# File 'extend/kernel.rb', line 282
+      
# File 'extend/kernel.rb', line 281
 
 def which(cmd, path = ENV.fetch("PATH"))
   PATH.new(path).each do |p|
@@ -3079,6 +3077,7 @@ 

       
 
 
+295
 296
 297
 298
@@ -3089,11 +3088,10 @@ 

 303
 304
 305
-306
-307

+306

     
     
-      
# File 'extend/kernel.rb', line 296
+      
# File 'extend/kernel.rb', line 295
 
 def which_all(cmd, path = ENV.fetch("PATH"))
   PATH.new(path).filter_map do |p|
@@ -3141,6 +3139,7 @@ 

       
 
 
+308
 309
 310
 311
@@ -3159,11 +3158,10 @@ 

 324
 325
 326
-327
-328

+327

     
     
-      
# File 'extend/kernel.rb', line 309
+      
# File 'extend/kernel.rb', line 308
 
 def which_editor(silent: false)
   editor = Homebrew::EnvConfig.editor
@@ -3219,12 +3217,12 @@ 

       
 
 
+255
 256
-257
-258

+257

     
     
-      
# File 'extend/kernel.rb', line 256
+      
# File 'extend/kernel.rb', line 255
 
 def with_custom_locale(locale, &block)
   with_env(LC_ALL: locale, &block)
@@ -3276,6 +3274,7 @@ 
Example

       
 
 
+519
 520
 521
 522
@@ -3288,11 +3287,10 @@ 
Example

 529
 530
 531
-532
-533

+532

     
     
-      
# File 'extend/kernel.rb', line 520
+      
# File 'extend/kernel.rb', line 519
 
 def with_env(hash)
   old_values = {}
@@ -3342,12 +3340,12 @@ 

       
 
 
+251
 252
-253
-254

+253

     
     
-      
# File 'extend/kernel.rb', line 252
+      
# File 'extend/kernel.rb', line 251
 
 def with_homebrew_path(&block)
   with_env(PATH: PATH.new(ORIGINAL_PATHS), &block)
diff --git a/docs/OS/Mac.html b/docs/OS/Mac.html
index 53f570d6d..a35f101db 100644
--- a/docs/OS/Mac.html
+++ b/docs/OS/Mac.html
@@ -623,12 +623,12 @@ 

       
 
 
+90
 91
-92
-93

+92

     
     
-      
# File 'os/mac.rb', line 91
+      
# File 'os/mac.rb', line 90
 
 def self.active_developer_dir
   @active_developer_dir ||= Utils.popen_read("/usr/bin/xcode-select", "-print-path").strip
@@ -695,15 +695,15 @@ 

       
 
 
+200
 201
 202
 203
 204
-205
-206

+205

     
     
-      
# File 'os/mac.rb', line 201
+      
# File 'os/mac.rb', line 200
 
 def self.app_with_bundle_id(*ids)
   path = mdfind(*ids)
@@ -760,17 +760,17 @@ 

       
 
 
+37
 38
 39
 40
 41
 42
 43
-44
-45

+44

     
     
-      
# File 'os/mac.rb', line 38
+      
# File 'os/mac.rb', line 37
 
 def self.full_version
   odisabled "`MacOS.full_version` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@@ -829,13 +829,13 @@ 

       
 
 
+47
 48
 49
-50
-51

+50

     
     
-      
# File 'os/mac.rb', line 48
+      
# File 'os/mac.rb', line 47
 
 def self.full_version=(version)
   @full_version = MacOSVersion.new(version.chomp)
@@ -875,13 +875,13 @@ 

       
 
 
+84
 85
 86
-87
-88

+87

     
     
-      
# File 'os/mac.rb', line 85
+      
# File 'os/mac.rb', line 84
 
 def self.language
   odisabled "`MacOS.language` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@@ -921,6 +921,7 @@ 

       
 
 
+70
 71
 72
 73
@@ -932,11 +933,10 @@ 

 79
 80
 81
-82
-83

+82

     
     
-      
# File 'os/mac.rb', line 71
+      
# File 'os/mac.rb', line 70
 
 def self.languages
   odisabled "`MacOS.languages` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@@ -998,14 +998,14 @@ 

       
 
 
+53
 54
 55
 56
-57
-58

+57

     
     
-      
# File 'os/mac.rb', line 54
+      
# File 'os/mac.rb', line 53
 
 def self.latest_sdk_version
   # TODO: bump version when new Xcode macOS SDK is released
@@ -1053,6 +1053,7 @@ 

       
 
 
+170
 171
 172
 173
@@ -1079,11 +1080,10 @@ 

 194
 195
 196
-197
-198

+197

     
     
-      
# File 'os/mac.rb', line 171
+      
# File 'os/mac.rb', line 170
 
 def self.macports_or_fink
   paths = []
@@ -1175,14 +1175,14 @@ 

       
 
 
+208
 209
 210
 211
-212
-213

+212

     
     
-      
# File 'os/mac.rb', line 209
+      
# File 'os/mac.rb', line 208
 
 def self.mdfind(*ids)
   (@mdfind ||= {}).fetch(ids) do
@@ -1251,12 +1251,12 @@ 

       
 
 
+221
 222
-223
-224

+223

     
     
-      
# File 'os/mac.rb', line 222
+      
# File 'os/mac.rb', line 221
 
 def self.mdfind_query(*ids)
   ids.map! { |id| "kMDItemCFBundleIdentifier == #{id}" }.join(" || ")
@@ -1295,14 +1295,14 @@ 

       
 
 
+214
 215
 216
 217
-218
-219

+218

     
     
-      
# File 'os/mac.rb', line 215
+      
# File 'os/mac.rb', line 214
 
 def self.pkgutil_info(id)
   (@pkginfo ||= {}).fetch(id) do |key|
@@ -1356,6 +1356,7 @@ 

       
 
 
+60
 61
 62
 63
@@ -1363,11 +1364,10 @@ 

 65
 66
 67
-68
-69

+68

     
     
-      
# File 'os/mac.rb', line 61
+      
# File 'os/mac.rb', line 60
 
 def self.preferred_perl_version
   if version >= :sonoma
@@ -1412,12 +1412,12 @@ 

       
 
 
+125
 126
-127
-128

+127

     
     
-      
# File 'os/mac.rb', line 126
+      
# File 'os/mac.rb', line 125
 
 def self.sdk(version = nil)
   sdk_locator.sdk_if_applicable(version)
@@ -1456,6 +1456,7 @@ 

       
 
 
+129
 130
 131
 132
@@ -1467,11 +1468,10 @@ 

 138
 139
 140
-141
-142

+141

     
     
-      
# File 'os/mac.rb', line 130
+      
# File 'os/mac.rb', line 129
 
 def self.sdk_for_formula(formula, version = nil, check_only_runtime_requirements: false)
   # If the formula requires Xcode, don't return the CLT SDK
@@ -1531,16 +1531,16 @@ 

       
 
 
+117
 118
 119
 120
 121
 122
-123
-124

+123

     
     
-      
# File 'os/mac.rb', line 118
+      
# File 'os/mac.rb', line 117
 
 def self.sdk_locator
   if CLT.installed? && CLT.provides_sdk?
@@ -1584,14 +1584,14 @@ 

       
 
 
+144
 145
 146
 147
-148
-149

+148

     
     
-      
# File 'os/mac.rb', line 145
+      
# File 'os/mac.rb', line 144
 
 def self.sdk_path(version = nil)
   odisabled "`MacOS.sdk_path` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@@ -1632,6 +1632,7 @@ 

       
 
 
+150
 151
 152
 153
@@ -1644,11 +1645,10 @@ 

 160
 161
 162
-163
-164

+163

     
     
-      
# File 'os/mac.rb', line 151
+      
# File 'os/mac.rb', line 150
 
 def self.sdk_path_if_needed(version = nil)
   odisabled "`MacOS.sdk_path_if_needed` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@@ -1711,6 +1711,7 @@ 

       
 
 
+95
 96
 97
 98
@@ -1720,11 +1721,10 @@ 

 102
 103
 104
-105
-106

+105

     
     
-      
# File 'os/mac.rb', line 96
+      
# File 'os/mac.rb', line 95
 
 def self.sdk_root_needed?
   odisabled "`MacOS.sdk_root_needed?` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@@ -1902,14 +1902,12 @@ 

 
 28
 29
-30
-31

+30

     
     
       
# File 'os/mac.rb', line 28
 
 def self.version
-  odisabled "`MacOS.version` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
   @version ||= full_version.strip_patch
 end