From 8086d66fc30ca6f6d430a17d5e653d318b6dffe5 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Tue, 25 Aug 2026 02:08:14 +0200 Subject: [PATCH] Collapse release construction package --- Cargo.lock | 17 +------------ Cargo.toml | 1 - epiphany-core/Cargo.toml | 2 +- epiphany-core/src/packaged_release.rs | 3 ++- .../src/packaged_release/construction.rs | 0 epiphany-release-construction/Cargo.toml | 24 ------------------- notes/model-atlas-vertical-slice.md | 2 +- 7 files changed, 5 insertions(+), 44 deletions(-) rename epiphany-release-construction/src/lib.rs => epiphany-core/src/packaged_release/construction.rs (100%) delete mode 100644 epiphany-release-construction/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 5aa3cd4f..07a4888c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -543,8 +543,8 @@ dependencies = [ "cultnet-rs", "ed25519-dalek", "epiphany-model-adapter", - "epiphany-release-construction", "epiphany-tool-adapter", + "fs2", "ghostlight-persona-projection", "ignore", "libc", @@ -616,21 +616,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "epiphany-release-construction" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "cultcache-rs", - "fs2", - "rmp-serde", - "serde", - "sha2", - "tempfile", - "uuid", -] - [[package]] name = "epiphany-tool-adapter" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 5a938a1d..c197e797 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ members = [ "epiphany-core", "epiphany-model-adapter", "epiphany-openai-runtime", - "epiphany-release-construction", "epiphany-tool-adapter", "epiphany-tool-mcp-runtime", ] diff --git a/epiphany-core/Cargo.toml b/epiphany-core/Cargo.toml index 02843984..4ff332fd 100644 --- a/epiphany-core/Cargo.toml +++ b/epiphany-core/Cargo.toml @@ -17,9 +17,9 @@ ctrlc = { version = "3.5.1", features = ["termination"] } cultcache-rs = { path = "../vendor/cultcache-rs" } cultmesh-rs = { path = "../vendor/cultmesh-rs" } cultnet-rs = { path = "../vendor/cultnet-rs" } -epiphany-release-construction = { path = "../epiphany-release-construction" } epiphany-model-adapter = { path = "../epiphany-model-adapter" } epiphany-tool-adapter = { path = "../epiphany-tool-adapter" } +fs2 = "0.4" ghostlight-persona-projection = { git = "https://github.com/GameCult/Ghostlight.git", rev = "22281891cbf9258db80c15a9fd465e6fa251e7dd", package = "ghostlight-persona-projection" } ed25519-dalek = "2" ignore = "0.4.23" diff --git a/epiphany-core/src/packaged_release.rs b/epiphany-core/src/packaged_release.rs index 0e5cdbcd..1f8029f7 100644 --- a/epiphany-core/src/packaged_release.rs +++ b/epiphany-core/src/packaged_release.rs @@ -4,7 +4,8 @@ use chrono::Utc; use cultcache_rs::SingleFileMessagePackBackingStore; use std::path::Path; -pub use epiphany_release_construction::*; +mod construction; +pub use construction::*; const RELEASE_KEY_PREFIX: &str = "epiphany-local/packaged-release/by-id/"; const RELEASE_HEAD_KEY: &str = "epiphany-local/packaged-release/current"; diff --git a/epiphany-release-construction/src/lib.rs b/epiphany-core/src/packaged_release/construction.rs similarity index 100% rename from epiphany-release-construction/src/lib.rs rename to epiphany-core/src/packaged_release/construction.rs diff --git a/epiphany-release-construction/Cargo.toml b/epiphany-release-construction/Cargo.toml deleted file mode 100644 index 75f80c71..00000000 --- a/epiphany-release-construction/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -[package] -name = "epiphany-release-construction" -version = "0.1.0" -edition = "2024" -publish = false -autobins = false -license-file = "../LICENSE" - -[lib] -name = "epiphany_release_construction" -path = "src/lib.rs" - -[dependencies] -anyhow = "1" -chrono = "0.4.44" -cultcache-rs = { path = "../vendor/cultcache-rs" } -fs2 = "0.4" -rmp-serde = "1" -serde = { version = "1", features = ["derive"] } -sha2 = "0.10" -uuid = { version = "1", features = ["v4"] } - -[dev-dependencies] -tempfile = "3" diff --git a/notes/model-atlas-vertical-slice.md b/notes/model-atlas-vertical-slice.md index 2065321a..60d1430c 100644 --- a/notes/model-atlas-vertical-slice.md +++ b/notes/model-atlas-vertical-slice.md @@ -207,7 +207,7 @@ uses: ```powershell $env:CARGO_TARGET_DIR='C:\Users\Meta\.cargo-target-codex' cargo test -p epiphany-core --lib atlas::runtime::tests -cargo test -p epiphany-release-construction --lib binary_suffix_follows_requested_target_not_packager_host +cargo test -p epiphany-core --lib binary_suffix_follows_requested_target_not_packager_host ``` Changes to publisher, projector, impact, transport, or Eve lowering logic must