Merge remote-tracking branch 'origin/main' into log-and-cat-after-workflow-finished

Cargo.lock

@@ -3465,9 +3465,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.10"
+version = "0.21.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
 dependencies = [
  "log",
  "ring 0.17.8",

magic-nix-cache/src/main.rs

@@ -263,7 +263,7 @@ async fn main_cli() -> Result<()> {
             format!(
                 // NOTE(cole-h): We want to exit 0 even if the hook failed, otherwise it'll fail the
                 // build itself
-                "#! /bin/sh\nRUST_LOG=trace RUST_BACKTRACE=full exec {} --server {}\n",
+                "#! /bin/sh\nRUST_LOG=trace RUST_BACKTRACE=full {} --server {} || :\n",
                 std::env::current_exe()
                     .with_context(|| "Getting the path of magic-nix-cache")?
                     .display(),