Skip to content

Commit

Permalink
downgrade git error to a warning, and skip UX check in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
lolbinarycat committed Aug 27, 2024
1 parent cea707d commit 3743cdb
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/bootstrap/src/core/sanity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,13 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
cmd_finder.must_have(s);
}

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

0 comments on commit 3743cdb

Please sign in to comment.