Merge pull request #119 from gsora/gsora/fix-ci-download

fix: on non-TTY terminals, if forced, proceed with toolchain download and install
This commit is contained in:
Sean Cross 2022-03-19 00:27:17 +08:00 committed by GitHub
commit 18f7a4519c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View file

@ -31,7 +31,7 @@ jobs:
- uses: Swatinem/rust-cache@v1
- name: Install RISC-V toolkit
run: cargo xtask install-toolkit
run: cargo xtask install-toolkit --force
- name: Build hosted-ci
run: cargo xtask ${{ matrix.task }}

View file

@ -1122,8 +1122,9 @@ fn ensure_compiler(
// Since no sysroot exists, we must download a new one.
let toolchain_path =
get_sysroot(None)?.ok_or_else(|| "default toolchain not installed".to_owned())?;
// If the terminal is a tty, offer to download the latest toolchain.
if !atty::is(atty::Stream::Stdin) {
// If the terminal is a tty, or if toolchain installation is forced,
// download the latest toolchain.
if !atty::is(atty::Stream::Stdin) && !force_install {
return Err(format!("Toolchain for {} not found", target));
}