Merge pull request #2759 from fermyon/build-fixs

Build fixes

Author: lann

.github/workflows/factors.yml

@@ -75,15 +75,10 @@ impl ModuleInfo {
     /// Returns true if the given module was heuristically probably compiled
     /// with wit-bindgen.
     pub fn probably_uses_wit_bindgen(&self) -> bool {
-        if self.bindgen.is_some() {
-            // Presence of bindgen metadata is a strong signal
-            true
-        } else if self.realloc_export.is_some() {
+        // Presence of bindgen metadata is a strong signal
+        self.bindgen.is_some() ||
             // A canonical ABI realloc export is a decent signal
-            true
-        } else {
-            false
-        }
+            self.realloc_export.is_some()
     }
 
     /// Returns the wit-bindgen metadata producers processed-by field, if

Cargo.lock

@@ -30,7 +30,7 @@ impl RuntimeConfigResolver {
     /// This takes as arguments:
     /// * the directory to use as the default location for SQLite databases.
     ///   Usually this will be the path to the `.spin` state directory. If
-    ///  `None`, the default database will be in-memory.
+    ///   `None`, the default database will be in-memory.
     /// * the path to the directory from which relative paths to
     ///   local SQLite databases are resolved.  (this should most likely be the
     ///   path to the runtime-config file or the current working dir).

crates/componentize/src/module_info.rs

@@ -15,25 +15,5 @@ toml = "0.8"
 tracing = { workspace = true }
 wasmtime = { workspace = true }
 
-[dev-dependencies]
-http = "1.1.0"
-http-body-util = "0.1.2"
-serde_json = "1.0"
-spin-componentize = { path = "../componentize" }
-spin-factors-derive = { path = "../factors-derive", features = ["expander"] }
-spin-factor-key-value = { path = "../factor-key-value" }
-spin-factor-key-value-redis = { path = "../factor-key-value-redis" }
-spin-factor-key-value-spin = { path = "../factor-key-value-spin" }
-spin-factor-outbound-http = { path = "../factor-outbound-http" }
-spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
-spin-factor-variables = { path = "../factor-variables" }
-spin-factor-wasi = { path = "../factor-wasi" }
-spin-loader = { path = "../loader" }
-tokio = { version = "1", features = ["macros", "rt", "sync"] }
-wasmtime-wasi-http = { workspace = true }
-
-[build-dependencies]
-cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
-
 [lints]
 workspace = true

crates/factor-sqlite/src/runtime_config/spin.rs

@@ -1,19 +1,6 @@
-use std::path::Path;
-
-use cargo_target_dep::build_target_dep;
-
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     // Enable spin-factors-derive to emit expanded macro output.
     let out_dir = std::env::var("OUT_DIR").unwrap();
     println!("cargo:rustc-env=SPIN_FACTORS_DERIVE_EXPAND_DIR={out_dir}");
-
-    let root = "tests/smoke-app";
-    build_target_dep(root, Path::new("tests/smoke-app/smoke_app.wasm"))
-        .release()
-        .target("wasm32-wasi")
-        .build();
-    println!("cargo:rerun-if-changed={root}/Cargo.toml");
-    println!("cargo:rerun-if-changed={root}/Cargo.lock");
-    println!("cargo:rerun-if-changed={root}/src");
 }