ci: Catch warning in all jobs

taiki-e · Apr 23, 2024 · daf7113 · daf7113
1 parent ffed4f4
commit daf7113
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: -D warnings
   RUSTUP_MAX_RETRIES: 10
+  CARGO_LLVM_COV_DENY_WARNINGS: 1
 
 defaults:
   run:

diff --git a/src/cargo.rs b/src/cargo.rs
@@ -56,7 +56,7 @@ impl Workspace {
         let rustc = ProcessBuilder::from(config.rustc().clone());
         let mut rustc_version = config.rustc_version()?;
         rustc_version.nightly =
-            rustc_version.nightly || std::env::var("RUSTC_BOOTSTRAP").ok().as_deref() == Some("1");
+            rustc_version.nightly || env::var_os("RUSTC_BOOTSTRAP").unwrap_or_default() == "1";
 
         if doctests && !rustc_version.nightly {
             bail!("--doctests flag requires nightly toolchain; consider using `cargo +nightly llvm-cov`")

diff --git a/src/main.rs b/src/main.rs
@@ -55,8 +55,7 @@ fn main() {
         error!("{e:#}");
     }
     if term::error()
-        || term::warn()
-            && env::var_os("CARGO_LLVM_COV_DENY_WARNINGS").filter(|v| v == "true").is_some()
+        || term::warn() && env::var_os("CARGO_LLVM_COV_DENY_WARNINGS").unwrap_or_default() == "1"
     {
         std::process::exit(1)
     }

diff --git a/tests/auxiliary/mod.rs b/tests/auxiliary/mod.rs
@@ -34,7 +34,7 @@ pub(crate) fn cargo_llvm_cov(subcommand: &str) -> Command {
     if !subcommand.is_empty() {
         cmd.arg(subcommand);
     }
-    cmd.env("CARGO_LLVM_COV_DENY_WARNINGS", "true");
+    cmd.env("CARGO_LLVM_COV_DENY_WARNINGS", "1");
     cmd.env_remove("RUSTFLAGS")
         .env_remove("RUSTDOCFLAGS")
         .env_remove("CARGO_BUILD_RUSTFLAGS")