From c96c9f765cf0c4ca0b214b2ee59d18ef32daf1fb Mon Sep 17 00:00:00 2001
From: "Charles E. Lehner" <charles.lehner@spruceid.com>
Date: Thu, 24 Sep 2020 10:36:54 -0400
Subject: [PATCH] Use Workspace

---
 .github/workflows/build.yml | 18 ++++--------------
 Cargo.toml                  |  5 +++++
 did-resolve/.gitignore      |  2 --
 did-resolve/Cargo.toml      |  5 +----
 4 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 did-resolve/.gitignore

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 58ed6e454..3cd537b36 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,11 +17,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Build ssi
-      run: cargo build --verbose
+    - name: Build
+      run: cargo build --verbose --workspace
 
-    - name: Test ssi
-      run: cargo test --verbose
+    - name: Test
+      run: cargo test --verbose --workspace
 
     - name: Test vc-test-suite
       run: |
@@ -31,13 +31,3 @@ jobs:
         npm i
         cp ../ssi/src/bin/ssi-vc-test/config.json .
         npm test
-
-    - name: Build did-resolve
-      run: |
-        cd did-resolve
-        cargo build --verbose
-
-    - name: Test did-resolve
-      run: |
-        cd did-resolve
-        cargo test --verbose
diff --git a/Cargo.toml b/Cargo.toml
index 34a20aa06..2af9c5aa5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,3 +16,8 @@ derive_builder = "0.9"
 base64 = "0.12"
 jsonwebtoken = "7"
 ring = "0.16"
+
+[workspace]
+members = [
+  "did-resolve",
+]
diff --git a/did-resolve/.gitignore b/did-resolve/.gitignore
deleted file mode 100644
index 96ef6c0b9..000000000
--- a/did-resolve/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-Cargo.lock
diff --git a/did-resolve/Cargo.toml b/did-resolve/Cargo.toml
index 6a924e041..20f2d0ca1 100644
--- a/did-resolve/Cargo.toml
+++ b/did-resolve/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Charles E. Lehner <charles.lehner@spruceid.com>"]
 edition = "2018"
 
 [dependencies]
-ssi = "0.1"
+ssi = { path = "../" }
 chrono = { version = "0.4", features = ["serde"] }
 tokio = { version = "0.2", features = ["macros", "stream"] }
 serde = { version = "1.0", features = ["derive"] }
@@ -17,6 +17,3 @@ http = "0.2"
 async-trait = "0.1"
 percent-encoding = "2.1"
 serde_urlencoded = "0.7"
-
-[patch.crates-io]
-ssi = { path = "../" }