Fix building utoipa-rapidoc & utoipa-scalar

juhaku · Sep 9, 2024 · a1d653b · a1d653b
1 parent fcdb5db
commit a1d653b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -3,35 +3,42 @@
 set -e
 
 : "${CARGO:=cargo}"
+: "${CARGO_COMMAND:=test}"
 
 crates="${1:-utoipa utoipa-gen utoipa-swagger-ui utoipa-redoc utoipa-rapidoc utoipa-scalar utoipa-axum}"
 
 for crate in $crates; do
     echo "Testing crate: $crate..."
 
     if [[ "$crate" == "utoipa" ]]; then
-        $CARGO test -p utoipa --features openapi_extensions,preserve_order,preserve_path_order,debug,macros
+        $CARGO ${CARGO_COMMAND} -p utoipa
+        $CARGO ${CARGO_COMMAND} -p utoipa --features openapi_extensions,preserve_order,preserve_path_order,debug,macros
     elif [[ "$crate" == "utoipa-gen" ]]; then
-        $CARGO test -p utoipa-gen --features utoipa/actix_extras,chrono,decimal,utoipa/uuid,uuid,utoipa/ulid,ulid,utoipa/url,url,utoipa/time,time,utoipa/repr,utoipa/smallvec,smallvec,rc_schema,utoipa/rc_schema,utoipa/macros
-        $CARGO test -p utoipa-gen --test schema_derive_test --features decimal_float,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --features utoipa/actix_extras,chrono,decimal,utoipa/uuid,uuid,utoipa/ulid,ulid,utoipa/url,url,utoipa/time,time,utoipa/repr,utoipa/smallvec,smallvec,rc_schema,utoipa/rc_schema,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test schema_derive_test --features decimal_float,utoipa/macros
 
-        $CARGO test -p utoipa-gen --test path_derive_auto_into_responses --features auto_into_responses,utoipa/uuid,uuid,utoipa/macros
-        $CARGO test -p utoipa-gen --test path_derive_actix --test path_parameter_derive_actix --features actix_extras,utoipa/uuid,uuid,utoipa/chrono,chrono,utoipa/time,time,utoipa/macros
-        $CARGO test -p utoipa-gen --test path_derive_auto_into_responses_actix --features actix_extras,utoipa/auto_into_responses,utoipa/uuid,uuid,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test path_derive_auto_into_responses --features auto_into_responses,utoipa/uuid,uuid,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test path_derive_actix --test path_parameter_derive_actix --features actix_extras,utoipa/uuid,uuid,utoipa/chrono,chrono,utoipa/time,time,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test path_derive_auto_into_responses_actix --features actix_extras,utoipa/auto_into_responses,utoipa/uuid,uuid,utoipa/macros
 
-        $CARGO test -p utoipa-gen --test path_derive_rocket --features rocket_extras,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test path_derive_rocket --features rocket_extras,utoipa/macros
 
-        $CARGO test -p utoipa-gen --test path_derive_axum_test --features axum_extras,utoipa/macros
-        $CARGO test -p utoipa-gen --test path_derive_auto_into_responses_axum --features axum_extras,utoipa/auto_into_responses,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test path_derive_axum_test --features axum_extras,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-gen --test path_derive_auto_into_responses_axum --features axum_extras,utoipa/auto_into_responses,utoipa/macros
     elif [[ "$crate" == "utoipa-swagger-ui" ]]; then
-        $CARGO test -p utoipa-swagger-ui --features actix-web,rocket,axum,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-swagger-ui
+        $CARGO ${CARGO_COMMAND} -p utoipa-swagger-ui --features actix-web,rocket,axum,utoipa/macros
     elif [[ "$crate" == "utoipa-redoc" ]]; then
-        $CARGO test -p utoipa-redoc --features actix-web,rocket,axum,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-redoc --features actix-web,rocket,axum,utoipa/macros
     elif [[ "$crate" == "utoipa-rapidoc" ]]; then
-        $CARGO test -p utoipa-rapidoc --features actix-web,rocket,axum,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-rapidoc
+        $CARGO ${CARGO_COMMAND} -p utoipa-rapidoc --features actix-web,rocket,axum,utoipa/macros
     elif [[ "$crate" == "utoipa-scalar" ]]; then
-        $CARGO test -p utoipa-scalar --features actix-web,rocket,axum,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-scalar
+        $CARGO ${CARGO_COMMAND} -p utoipa-scalar --features actix-web,rocket,axum,utoipa/macros
     elif [[ "$crate" == "utoipa-axum" ]]; then
-        $CARGO test -p utoipa-axum --features debug,utoipa/debug,utoipa/macros
+        $CARGO ${CARGO_COMMAND} -p utoipa-axum
+        $CARGO ${CARGO_COMMAND} -p utoipa-axum --features debug,utoipa/debug,utoipa/macros
     fi
 done
diff --git a/utoipa-rapidoc/Cargo.toml b/utoipa-rapidoc/Cargo.toml
@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "doc_cfg"]
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
-utoipa = { version = "5.0.0-alpha", path = "../utoipa", default-features = false }
+utoipa = { version = "5.0.0-alpha", path = "../utoipa", default-features = false, features = ["macros"] }
 actix-web = { version = "4", optional = true, default-features = false }
 rocket = { version = "0.5", features = ["json"], optional = true }
 axum = { version = "0.7", default-features = false, features = ["json"], optional = true }

diff --git a/utoipa-scalar/Cargo.toml b/utoipa-scalar/Cargo.toml
@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "doc_cfg"]
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
-utoipa = { version = "5.0.0-alpha.0", path = "../utoipa", default-features = false }
+utoipa = { version = "5.0.0-alpha.0", path = "../utoipa", default-features = false, features = ["macros"] }
 actix-web = { version = "4", optional = true, default-features = false }
 rocket = { version = "0.5", features = ["json"], optional = true }
 axum = { version = "0.7", default-features = false, optional = true }