wip: move api-client-test out of the server package

typhon-ci · Sep 20, 2023 · c42c333 · c42c333
1 parent 5668f90
commit c42c333
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
 members = [
   "typhon",
-  "typhon/api-client-test",
   "typhon-types",
   "typhon-webapp",
+  "api-client-test",
 ]
 default-members = [
   "typhon"

diff --git a/typhon/api-client-test/Cargo.toml → api-client-test/Cargo.toml b/typhon/api-client-test/Cargo.toml → api-client-test/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.1"
 edition = "2021"
 
 [dependencies]
-typhon-types = { path = "../../typhon-types" }
+typhon-types = { path = "../typhon-types" }
 serde = "1.0"
 serde_json = "1.0"
 tokio = { version = "1.22", features = [ "full" ] }

diff --git a/typhon/api-client-test/src/main.rs → api-client-test/src/main.rs b/typhon/api-client-test/src/main.rs → api-client-test/src/main.rs
diff --git a/nix/api-client-test.nix b/nix/api-client-test.nix
@@ -7,11 +7,11 @@
   src = lib.sourceByRegex ./.. [
     "Cargo.toml"
     "Cargo.lock"
-    "typhon.*"
+    "api-client-test.*"
     "typhon-types.*"
   ];
 
-  cargoToml = ../typhon/api-client-test/Cargo.toml;
+  cargoToml = ../api-client-test/Cargo.toml;
 
   cargoExtraArgs = "-p typhon-api-client-test";
 

diff --git a/nix/webapp.nix b/nix/webapp.nix
@@ -56,9 +56,9 @@
       mkdir -p typhon/src
       cp ${dummyTyphonCargoToml} typhon/Cargo.toml
       touch typhon/src/main.rs
-      mkdir -p typhon/api-client-test/src
-      cp ${dummyApiTestCargoToml} typhon/api-client-test/Cargo.toml
-      touch typhon/api-client-test/src/main.rs
+      mkdir -p api-client-test/src
+      cp ${dummyApiTestCargoToml} api-client-test/Cargo.toml
+      touch api-client-test/src/main.rs
 
       ln -s ${nodeDependencies}/lib/node_modules typhon-webapp/node_modules
       # See #351 on Trunk