From 2946bb11075acaecea30e510517350fde05cf342 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Mon, 6 Nov 2023 13:12:16 +0100 Subject: [PATCH 1/3] Force disable GPG commit signing in tests --- tests/git.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/git.rs b/tests/git.rs index 210e0b3..eb74313 100644 --- a/tests/git.rs +++ b/tests/git.rs @@ -205,6 +205,11 @@ impl FakeRemote { .set_raw_value("committer", None, "email", "tests@integration.se") .unwrap(); + // Disable GPG signing, it breaks testing if the user has it enabled + config + .set_raw_value("commit", None, "gpgsign", "false") + .unwrap(); + config.commit_auto_rollback().unwrap() } From ba6f68a03c5956fd719ec8d8bd63de39f3df7876 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Mon, 6 Nov 2023 13:17:08 +0100 Subject: [PATCH 2/3] Update gix while we are here --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 27d0acd..59864f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ twox-hash = { version = "1.6", default-features = false } [dependencies.gix] optional = true -version = "0.54" +version = "0.55" default-features = false features = ["blocking-http-transport-reqwest"] From a50877ecac413d4e8208a689d37529d5f8212c53 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Mon, 6 Nov 2023 13:18:44 +0100 Subject: [PATCH 3/3] Fixup deny --- deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 66866ac..ece65ef 100644 --- a/deny.toml +++ b/deny.toml @@ -51,7 +51,7 @@ skip = [ # toml-edit is user a newer version :p { name = "indexmap", version = "=1.9.3" }, # trust-dns-resolver pulls in a new version than the rest of them use (including itself) - { name = "socket2", version = "=0.4.9" }, + { name = "socket2", version = "=0.4.10" }, # A bunch of users still of syn 1.0 :p { name = "syn", version = "=1.0.109" }, ]