From d61face7fef9a1a26d9763412783465738d1d9ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 19:57:36 +0000 Subject: [PATCH 1/2] Bump rustls from 0.21.10 to 0.21.11 Bumps [rustls](https://github.com/rustls/rustls) from 0.21.10 to 0.21.11. - [Release notes](https://github.com/rustls/rustls/releases) - [Changelog](https://github.com/rustls/rustls/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustls/rustls/compare/v/0.21.10...v/0.21.11) --- updated-dependencies: - dependency-name: rustls dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae5b563..679c7c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3464,9 +3464,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", From 389a63ce68d845112e6ca729c0de4bd5ba3d4470 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 6 May 2024 12:00:24 -0400 Subject: [PATCH 2/2] Ignore post-build-hook errors --- magic-nix-cache/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magic-nix-cache/src/main.rs b/magic-nix-cache/src/main.rs index 3601399..51d4b40 100644 --- a/magic-nix-cache/src/main.rs +++ b/magic-nix-cache/src/main.rs @@ -261,7 +261,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(),