annotations: re-apply some fixes.

Co-authored-by: Carlo Cabrera <[email protected]>
Homebrew · Sep 16, 2024 · f120d02 · f120d02
1 parent 1c39009
commit f120d02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Library/Homebrew/extend/kernel.rb b/Library/Homebrew/extend/kernel.rb
@@ -65,8 +65,11 @@ def oh1(title, truncate: :auto)
   sig { params(message: T.any(String, Exception)).void }
   def opoo(message)
     Tty.with($stderr) do |stderr|
-      stderr.puts Formatter.warning(message, label: "Warning")
-      GitHub::Actions.puts_annotation_if_env_set(:warning, message.to_s)
+      if GitHub::Actions.env_set?
+        GitHub::Actions.puts_annotation_if_env_set(:warning, message.to_s)
+      else
+        stderr.puts Formatter.warning(message, label: "Warning")
+      end
     end
   end
 
@@ -79,8 +82,11 @@ def onoe(message)
     require "utils/github/actions"
 
     Tty.with($stderr) do |stderr|
-      stderr.puts Formatter.error(message, label: "Error")
-      GitHub::Actions.puts_annotation_if_env_set(:error, message.to_s)
+      if GitHub::Actions.env_set?
+        GitHub::Actions.puts_annotation_if_env_set(:error, message.to_s)
+      else
+        stderr.puts Formatter.error(message, label: "Error")
+      end
     end
   end
 

diff --git a/Library/Homebrew/utils/github/actions.rb b/Library/Homebrew/utils/github/actions.rb
@@ -51,7 +51,7 @@ def self.puts_annotation_if_env_set(type, message, file: nil, line: nil)
       return unless env_set?
 
       std = (type == :notice) ? $stdout : $stderr
-      std.puts Annotation.new(type, message)
+      std.puts Annotation.new(type, message, file:, line:)
     end
 
     # Helper class for formatting annotations on GitHub Actions.