From af4e6c19377eca3f862bd2d7483c30831e998886 Mon Sep 17 00:00:00 2001
From: jyn <github@jyn.dev>
Date: Sun, 4 Jun 2023 22:11:05 -0500
Subject: [PATCH] Don't double-print status messages in GHA

Before:

```
Building stage0 tool jsondocck (x86_64-unknown-linux-gnu)
  Building stage0 tool jsondocck (x86_64-unknown-linux-gnu)
   Downloading crates ...
```

After:

```
Building stage0 tool jsondocck (x86_64-unknown-linux-gnu)
   Downloading crates ...
```
---
 src/bootstrap/lib.rs             | 1 -
 src/tools/build_helper/src/ci.rs | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index aa5d1bdd37f..7ed8d2bfa7f 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1069,7 +1069,6 @@ fn msg_sysroot_tool(
     }
 
     fn group(&self, msg: &str) -> Option<gha::Group> {
-        self.info(&msg);
         match self.config.dry_run {
             DryRun::SelfCheck => None,
             DryRun::Disabled | DryRun::UserSelected => Some(gha::group(&msg)),
diff --git a/src/tools/build_helper/src/ci.rs b/src/tools/build_helper/src/ci.rs
index d2e9c324af8..d106e5b339b 100644
--- a/src/tools/build_helper/src/ci.rs
+++ b/src/tools/build_helper/src/ci.rs
@@ -46,6 +46,8 @@ pub mod gha {
     pub fn group(name: impl std::fmt::Display) -> Group {
         if std::env::var_os("GITHUB_ACTIONS").is_some() {
             eprintln!("::group::{name}");
+        } else {
+            eprintln!("{name}")
         }
         Group(())
     }