diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2023-06-05 17:02:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 17:02:52 +0200 |
| commit | 154949dacdf4d34c967c3aeddcf0cdc27878ad59 (patch) | |
| tree | 3fd2107add6d6d6825a7cad9ca5586fc5241e992 | |
| parent | 0258a16cdc917e379898c8b0e5765e5cf209994e (diff) | |
| parent | af4e6c19377eca3f862bd2d7483c30831e998886 (diff) | |
| download | rust-154949dacdf4d34c967c3aeddcf0cdc27878ad59.tar.gz rust-154949dacdf4d34c967c3aeddcf0cdc27878ad59.zip | |
Rollup merge of #112299 - jyn514:gha-progress, r=oli-obk
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 ... ``` r? `@oli-obk`
| -rw-r--r-- | src/bootstrap/lib.rs | 1 | ||||
| -rw-r--r-- | src/tools/build_helper/src/ci.rs | 2 |
2 files changed, 2 insertions, 1 deletions
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 @@ impl Build { } 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(()) } |