Skip to content

Commit 3743cdb

Browse files
committed
downgrade git error to a warning, and skip UX check in CI
1 parent cea707d commit 3743cdb

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/bootstrap/src/core/sanity.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,13 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
382382
cmd_finder.must_have(s);
383383
}
384384

385-
warn_old_master_branch(&build.config.git_config(), &build.config.src)
386-
.map_err(|e| e.to_string())
387-
.unwrap();
385+
// this warning is useless in CI,
386+
// and CI probably won't have the right branches anyway.
387+
if !build_helper::ci::CiEnv::is_ci() {
388+
if let Err(e) = warn_old_master_branch(&build.config.git_config(), &build.config.src)
389+
.map_err(|e| e.to_string())
390+
{
391+
eprintln!("unable to check if upstream branch is old: {e}");
392+
}
393+
}
388394
}

0 commit comments

Comments
 (0)