From 0df98038edd3188fafde1c9006d52f7d5ae54b6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:05:08 +0000
Subject: [PATCH 1/2] build(deps): bump vergen from 7.2.0 to 7.2.1 (#4582)

Bumps [vergen](https://github.com/rustyhorde/vergen) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/7.2.0...7.2.1)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock        | 4 ++--
 zebrad/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 121a9bb4251..b5b72c7e23d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5669,9 +5669,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "vergen"
-version = "7.2.0"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626fd028e124b3ee607632d92ba99b5a5a086cfd404ede4af6c19ecd9b75a02d"
+checksum = "b1f44ef1afcf5979e34748c12595f9589f3dc4e34abf156fb6d95f9b835568dc"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
index 6a417a18bdf..4b9ad4cc47b 100644
--- a/zebrad/Cargo.toml
+++ b/zebrad/Cargo.toml
@@ -106,7 +106,7 @@ proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 
 [build-dependencies]
-vergen = { version = "7.2.0", default-features = false, features = ["cargo", "git"] }
+vergen = { version = "7.2.1", default-features = false, features = ["cargo", "git"] }
 
 # test feature lightwalletd-grpc-tests
 tonic-build = { version = "0.7.2", optional = true }

From a1074954e00c858ba77c51d835b09a826d063593 Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Wed, 15 Jun 2022 10:31:18 +1000
Subject: [PATCH 2/2] Disable zcash_rpc_conflict test on macOS (#4614)

---
 zebrad/tests/acceptance.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs
index 628a543e4e4..5fef4b6c934 100644
--- a/zebrad/tests/acceptance.rs
+++ b/zebrad/tests/acceptance.rs
@@ -1358,8 +1358,11 @@ fn zebra_tracing_conflict() -> Result<()> {
 /// Start 2 zebrad nodes using the same RPC listener port, but different
 /// state directories and Zcash listener ports. The first node should get
 /// exclusive use of the port. The second node will panic.
+///
+/// This test is sometimes unreliable on Windows, and hangs on macOS.
+/// We believe this is a CI infrastructure issue, not a platform-specific issue.
 #[test]
-#[cfg(not(target_os = "windows"))]
+#[cfg(not(any(target_os = "windows", target_os = "macos")))]
 fn zebra_rpc_conflict() -> Result<()> {
     zebra_test::init();