Merge pull request #685 from kamirr/fix_fj_serialization2

Followup on PR #682 (fj serialization)
hannobraun · Jun 13, 2022 · cd120d2 · cd120d2
2 parents 07405b6 + aa6f13e
commit cd120d2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -116,7 +116,9 @@ jobs:
         uses: actions-rs/cargo@4ff6ec2846f6e7217c1a9b0b503506665f134c4b
         with:
           command: build
+          args: --all-features
       - name: Run `cargo test`
         uses: actions-rs/cargo@4ff6ec2846f6e7217c1a9b0b503506665f134c4b
         with:
           command: test
+          args: --all-features
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,13 +22,15 @@ members = [
     "tools/release-operator",
 ]
 default-members = [
+    "crates/fj",
     "crates/fj-app",
     "crates/fj-export",
     "crates/fj-host",
     "crates/fj-interop",
     "crates/fj-kernel",
     "crates/fj-math",
     "crates/fj-operations",
+    "crates/fj-proc",
     "crates/fj-viewer",
     "crates/fj-window",
 ]
diff --git a/crates/fj/Cargo.toml b/crates/fj/Cargo.toml
@@ -18,8 +18,8 @@ serialization = ["serde"]
 [dependencies]
 serde = { version = "1.0.7", features = ["derive"], optional = true }
 
-[dev-dependencies]
-serde_json = "1.0.81"
-
 [dependencies.fj-proc]
-path = "../../crates/fj-proc"
+path = "../../crates/fj-proc"
+
+[dev-dependencies]
+serde_json = "1.0.81"
diff --git a/justfile b/justfile
@@ -1,4 +1,4 @@
 build:
-    cargo clippy
-    cargo test
+    cargo clippy --all-features
+    cargo test --all-features
     cargo fmt --check