From 9d43568e4e6acafb8a634c302c3cf99ce92647ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:53:44 +0100
Subject: [PATCH] Use unreleased trybuild to fix CI (#7656)

---
 substrate/Cargo.lock                              | 3 +--
 substrate/frame/support/test/Cargo.toml           | 2 +-
 substrate/primitives/api/test/Cargo.toml          | 2 +-
 substrate/primitives/runtime-interface/Cargo.toml | 2 +-
 substrate/test-utils/Cargo.toml                   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 9a44096132..681a65fccd 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -9623,8 +9623,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "trybuild"
 version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d"
+source = "git+https://github.com/bkchr/trybuild.git?branch=bkchr-use-workspace-cargo-lock#0eaad05ba8a32a743751ff52b57a7d9f57da4869"
 dependencies = [
  "dissimilar",
  "glob",
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index 6d8064102c..01484ccfb8 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -21,7 +21,7 @@ sp-inherents = { version = "2.0.0", default-features = false, path = "../../../p
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-trybuild = "1.0.33"
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" }
diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml
index 867cdd6e57..1110b02020 100644
--- a/substrate/primitives/api/test/Cargo.toml
+++ b/substrate/primitives/api/test/Cargo.toml
@@ -21,7 +21,7 @@ sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-trybuild = "1.0.17"
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 rustversion = "1.0.0"
 
 [dev-dependencies]
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index bc36098f05..0138637366 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -30,7 +30,7 @@ sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine"
 sp-core = { version = "2.0.0", path = "../core" }
 sp-io = { version = "2.0.0", path = "../io" }
 rustversion = "1.0.0"
-trybuild = "1.0.23"
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 
 [features]
 default = [ "std" ]
diff --git a/substrate/test-utils/Cargo.toml b/substrate/test-utils/Cargo.toml
index ddadc2cb71..7606b0c1c1 100644
--- a/substrate/test-utils/Cargo.toml
+++ b/substrate/test-utils/Cargo.toml
@@ -18,4 +18,4 @@ tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
 sc-service = { version = "0.8.0", path = "../client/service" }
-trybuild = { version = "1.0", features = ["diff"] }
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock", features = [ "diff" ] }