Merge branch 'main' into issue4350_2

ZcashFoundation · Jun 15, 2022 · e3ba20d · e3ba20d
2 parents c078c4d + a107495
commit e3ba20d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 }

diff --git 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();