From 92be4e774e861e7c6a82e93b448d7ac5c0c4e7fe Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Thu, 28 Mar 2024 14:48:45 -0600 Subject: [PATCH] build fixes --- Makefile | 4 +++- core/startos/src/net/static_server.rs | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9a6dee60f..85bc2e7bd 100644 --- a/Makefile +++ b/Makefile @@ -89,6 +89,8 @@ format: test: $(CORE_SRC) $(ENVIRONMENT_FILE) cd core && cargo build && cargo test + npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts + (cd sdk && make test) cli: cd core && ./install-cli.sh @@ -173,7 +175,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime npm --prefix container-runtime ci touch container-runtime/node_modules -core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE) $(PLATFORM_FILE) +core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE) rm -rf core/startos/bindings (cd core/ && cargo test) npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs index e8207e3bf..f7fc2969f 100644 --- a/core/startos/src/net/static_server.rs +++ b/core/startos/src/net/static_server.rs @@ -33,11 +33,15 @@ use crate::middleware::db::SyncDb; use crate::middleware::diagnostic::DiagnosticMode; use crate::{diagnostic_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt}; -static NOT_FOUND: &[u8] = b"Not Found"; -static METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed"; -static NOT_AUTHORIZED: &[u8] = b"Not Authorized"; +const NOT_FOUND: &[u8] = b"Not Found"; +const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed"; +const NOT_AUTHORIZED: &[u8] = b"Not Authorized"; -static EMBEDDED_UIS: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static"); +#[cfg(all(feature = "daemon", not(test)))] +const EMBEDDED_UIS: Dir<'_> = + include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static"); +#[cfg(not(all(feature = "daemon", not(test))))] +const EMBEDDED_UIS: Dir<'_> = Dir::new("", &[]); const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];