Skip to content

Commit 154949d

Browse files
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`
2 parents 0258a16 + af4e6c1 commit 154949d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Diff for: src/bootstrap/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,6 @@ impl Build {
10691069
}
10701070

10711071
fn group(&self, msg: &str) -> Option<gha::Group> {
1072-
self.info(&msg);
10731072
match self.config.dry_run {
10741073
DryRun::SelfCheck => None,
10751074
DryRun::Disabled | DryRun::UserSelected => Some(gha::group(&msg)),

Diff for: src/tools/build_helper/src/ci.rs

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ pub mod gha {
4646
pub fn group(name: impl std::fmt::Display) -> Group {
4747
if std::env::var_os("GITHUB_ACTIONS").is_some() {
4848
eprintln!("::group::{name}");
49+
} else {
50+
eprintln!("{name}")
4951
}
5052
Group(())
5153
}

0 commit comments

Comments
 (0)