From 7dda074b7110495c4fe2a39a963ced965ce9d41f Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Sun, 12 Jun 2022 10:09:18 +0200 Subject: [PATCH 1/3] fj: move dev-dependencies to the end of Cargo.toml --- crates/fj/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/fj/Cargo.toml b/crates/fj/Cargo.toml index 83cd0801bd..2d39bcc635 100644 --- 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" \ No newline at end of file +path = "../../crates/fj-proc" + +[dev-dependencies] +serde_json = "1.0.81" \ No newline at end of file From 5a01d77148f410779266ca1c1aefb086d717eb01 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Sun, 12 Jun 2022 10:09:56 +0200 Subject: [PATCH 2/3] Add fj and fj-proc to default-members Without this the tests from these crates won't run in CI. --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index d9114c8d44..e542aa91f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ members = [ "tools/release-operator", ] default-members = [ + "crates/fj", "crates/fj-app", "crates/fj-export", "crates/fj-host", @@ -29,6 +30,7 @@ default-members = [ "crates/fj-kernel", "crates/fj-math", "crates/fj-operations", + "crates/fj-proc", "crates/fj-viewer", "crates/fj-window", ] From aa6f13e3eb3151c81fdbc58a172151861bc8a3cd Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Sun, 12 Jun 2022 10:12:04 +0200 Subject: [PATCH 3/3] CI: cargo {build,clippy,test} need --all-features This is so that no code is skipped during testing. --- .github/workflows/ci.yml | 2 ++ justfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e00891adf..f434ee6107 100644 --- 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/justfile b/justfile index 62d1e7f264..7c2c4287f0 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ build: - cargo clippy - cargo test + cargo clippy --all-features + cargo test --all-features cargo fmt --check