From b6a2848a506dd593a2c3c69ec2f10d49a5cefd9c Mon Sep 17 00:00:00 2001
From: Nick Mosher <nicholastmosher@gmail.com>
Date: Fri, 8 Jul 2022 21:08:56 -0400
Subject: [PATCH] Add multiple crates to wasm test workspace. Update selftest

---
 .github/workflows/selftest.yml              |  6 +++---
 wasm-workspace/Cargo.toml                   | 21 ++++-----------------
 wasm-workspace/crates/one/Cargo.toml        | 14 ++++++++++++++
 wasm-workspace/{ => crates/one}/src/main.rs |  0
 wasm-workspace/crates/two/Cargo.toml        |  9 +++++++++
 wasm-workspace/crates/two/src/main.rs       |  3 +++
 6 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 wasm-workspace/crates/one/Cargo.toml
 rename wasm-workspace/{ => crates/one}/src/main.rs (100%)
 create mode 100644 wasm-workspace/crates/two/Cargo.toml
 create mode 100644 wasm-workspace/crates/two/src/main.rs

diff --git a/.github/workflows/selftest.yml b/.github/workflows/selftest.yml
index 9de0205..3682d0d 100644
--- a/.github/workflows/selftest.yml
+++ b/.github/workflows/selftest.yml
@@ -24,9 +24,9 @@ jobs:
       - uses: ./
         with:
           cache-on-failure: true
-          target-dir: |
-            target/
-            wasm-workspace/target/
+          workspace-paths: |
+            ./
+            wasm-workspace/
 
       - run: |
           cargo install cargo-deny --locked
diff --git a/wasm-workspace/Cargo.toml b/wasm-workspace/Cargo.toml
index 8fb7ee1..3cd8359 100644
--- a/wasm-workspace/Cargo.toml
+++ b/wasm-workspace/Cargo.toml
@@ -1,18 +1,5 @@
 [workspace]
-members = ["."]
-
-[package]
-name = "wasm-workspace"
-version = "0.1.0"
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-reqwest = "0.11.0"
-async-std = "1"
-tracing = "0.1"
-tracing-futures = "0.2"
-serde = "1"
-serde_json = "1"
-toml = ""
+members = [
+    "crates/one",
+    "crates/two",
+]
diff --git a/wasm-workspace/crates/one/Cargo.toml b/wasm-workspace/crates/one/Cargo.toml
new file mode 100644
index 0000000..2c89270
--- /dev/null
+++ b/wasm-workspace/crates/one/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "wasm-one"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+reqwest = "0.11.0"
+async-std = "1"
+tracing = "0.1"
+tracing-futures = "0.2"
+serde = "1"
+serde_json = "1"
diff --git a/wasm-workspace/src/main.rs b/wasm-workspace/crates/one/src/main.rs
similarity index 100%
rename from wasm-workspace/src/main.rs
rename to wasm-workspace/crates/one/src/main.rs
diff --git a/wasm-workspace/crates/two/Cargo.toml b/wasm-workspace/crates/two/Cargo.toml
new file mode 100644
index 0000000..d907f29
--- /dev/null
+++ b/wasm-workspace/crates/two/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "wasm-two"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+clap = "3"
diff --git a/wasm-workspace/crates/two/src/main.rs b/wasm-workspace/crates/two/src/main.rs
new file mode 100644
index 0000000..e7a11a9
--- /dev/null
+++ b/wasm-workspace/crates/two/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}