Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 04:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Aiden McClelland
2024-03-28 15:31:54 -06:00
parent 92be4e774e
commit 7c63d4012f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -16,7 +16,7 @@ STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
COMPAT_SRC := $(shell git ls-files system-images/compat/) COMPAT_SRC := $(shell git ls-files system-images/compat/)
UTILS_SRC := $(shell git ls-files system-images/utils/) UTILS_SRC := $(shell git ls-files system-images/utils/)
BINFMT_SRC := $(shell git ls-files system-images/binfmt/) BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE) CORE_SRC := $(shell git ls-files -- core ':!:core/startos/bindings/*) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json
WEB_UI_SRC := $(shell git ls-files web/projects/ui) WEB_UI_SRC := $(shell git ls-files web/projects/ui)
WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard) WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
@@ -88,7 +88,7 @@ format:
cd core && cargo +nightly fmt cd core && cargo +nightly fmt
test: $(CORE_SRC) $(ENVIRONMENT_FILE) test: $(CORE_SRC) $(ENVIRONMENT_FILE)
cd core && cargo build && cargo test (cd core && cargo build && cargo test)
npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
(cd sdk && make test) (cd sdk && make test)
@@ -177,7 +177,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE) core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE)
rm -rf core/startos/bindings rm -rf core/startos/bindings
(cd core/ && cargo test) (cd core/ && cargo test --features=test)
npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings

3
core/startos/Cargo.toml
View File

@@ -41,6 +41,7 @@ default = ["cli", "daemon"]
dev = [] dev = []
unstable = ["console-subscriber", "tokio/tracing"] unstable = ["console-subscriber", "tokio/tracing"]
docker = [] docker = []
test = []
[dependencies] [dependencies]
aes = { version = "0.7.5", features = ["ctr"] } aes = { version = "0.7.5", features = ["ctr"] }
@@ -75,7 +76,7 @@ ed25519-dalek = { version = "2.1.1", features = [
"zeroize", "zeroize",
"rand_core", "rand_core",
"digest", "digest",
"pkcs8" "pkcs8",
] } ] }
ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" } ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [ emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [

6
core/startos/src/net/static_server.rs
View File

@@ -14,7 +14,7 @@ use futures::future::ready;
use http::header::ACCEPT_ENCODING; use http::header::ACCEPT_ENCODING;
use http::request::Parts as RequestParts; use http::request::Parts as RequestParts;
use http::{HeaderMap, Method, StatusCode}; use http::{HeaderMap, Method, StatusCode};
use include_dir::{include_dir, Dir}; use include_dir::Dir;
use new_mime_guess::MimeGuess; use new_mime_guess::MimeGuess;
use openssl::hash::MessageDigest; use openssl::hash::MessageDigest;
use openssl::x509::X509; use openssl::x509::X509;
@@ -37,10 +37,10 @@ const NOT_FOUND: &[u8] = b"Not Found";
const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed"; const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
const NOT_AUTHORIZED: &[u8] = b"Not Authorized"; const NOT_AUTHORIZED: &[u8] = b"Not Authorized";
#[cfg(all(feature = "daemon", not(test)))] #[cfg(all(feature = "daemon", not(feature = "test")))]
const EMBEDDED_UIS: Dir<'_> = const EMBEDDED_UIS: Dir<'_> =
include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static"); include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static");
#[cfg(not(all(feature = "daemon", not(test))))] #[cfg(not(all(feature = "daemon", not(feature = "test"))))]
const EMBEDDED_UIS: Dir<'_> = Dir::new("", &[]); const EMBEDDED_UIS: Dir<'_> = Dir::new("", &[]);
const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"]; const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];