From 3588dae424bd189f48d3768a98a15bc73c3701fa Mon Sep 17 00:00:00 2001 From: rekhoff Date: Mon, 2 Feb 2026 09:50:34 -0800 Subject: [PATCH 1/2] Added version directory meta files and additional move operation --- .../spacetimedb.bsatn.runtime/version.meta | 8 ++++++ .../spacetimedb.runtime/version.meta | 8 ++++++ tools/ci/src/main.rs | 28 +++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 sdks/csharp/unity-meta-skeleton~/spacetimedb.bsatn.runtime/version.meta create mode 100644 sdks/csharp/unity-meta-skeleton~/spacetimedb.runtime/version.meta diff --git a/sdks/csharp/unity-meta-skeleton~/spacetimedb.bsatn.runtime/version.meta b/sdks/csharp/unity-meta-skeleton~/spacetimedb.bsatn.runtime/version.meta new file mode 100644 index 00000000000..cfd02c27d4c --- /dev/null +++ b/sdks/csharp/unity-meta-skeleton~/spacetimedb.bsatn.runtime/version.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae5666f23a6d73c43b030a1b9ba5916b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/sdks/csharp/unity-meta-skeleton~/spacetimedb.runtime/version.meta b/sdks/csharp/unity-meta-skeleton~/spacetimedb.runtime/version.meta new file mode 100644 index 00000000000..5e6b18a2ed3 --- /dev/null +++ b/sdks/csharp/unity-meta-skeleton~/spacetimedb.runtime/version.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 414c282c02d41b7468a56cbff39145f4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/tools/ci/src/main.rs b/tools/ci/src/main.rs index d53b2fa4ba2..09a8a3d665d 100644 --- a/tools/ci/src/main.rs +++ b/tools/ci/src/main.rs @@ -95,7 +95,8 @@ fn check_global_json_policy() -> Result<()> { } fn overlay_unity_meta_skeleton(pkg_id: &str) -> Result<()> { - let skeleton_root = Path::new("sdks/csharp/unity-meta-skeleton~").join(pkg_id); + let skeleton_base = Path::new("sdks/csharp/unity-meta-skeleton~"); + let skeleton_root = skeleton_base.join(pkg_id); if !skeleton_root.exists() { return Ok(()); } @@ -105,14 +106,37 @@ fn overlay_unity_meta_skeleton(pkg_id: &str) -> Result<()> { return Ok(()); } + // Copy spacetimedb..meta + let pkg_root_meta = skeleton_base.join(format!("{pkg_id}.meta")); + if pkg_root_meta.exists() { + if let Some(parent) = pkg_root.parent() { + let pkg_meta_dst = parent.join(format!("{pkg_id}.meta")); + fs::copy(&pkg_root_meta, &pkg_meta_dst)?; + } + } + let versioned_dir = match find_only_subdir(&pkg_root) { Ok(dir) => dir, Err(err) => { - log::info!("Skipping Unity meta overlay for {pkg_id}: could not locate restored version dir: {err}"); + log::info!( + "Skipping Unity meta overlay for {pkg_id}: could not locate restored version dir: {err}" + ); return Ok(()); } }; + // If version.meta exists under the skeleton package, rename it to match the restored version dir. + let version_meta_template = skeleton_root.join("version.meta"); + if version_meta_template.exists() { + if let Some(parent) = versioned_dir.parent() { + let version_name = versioned_dir + .file_name() + .expect("versioned directory should have a file name"); + let version_meta_dst = parent.join(format!("{}.meta", version_name.to_string_lossy())); + fs::copy(&version_meta_template, &version_meta_dst)?; + } + } + copy_overlay_dir(&skeleton_root, &versioned_dir) } From 9e182fdb8c913ce6de40e2977992865a9764fca8 Mon Sep 17 00:00:00 2001 From: rekhoff Date: Mon, 2 Feb 2026 10:06:51 -0800 Subject: [PATCH 2/2] Updated after lint fix --- tools/ci/src/main.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/ci/src/main.rs b/tools/ci/src/main.rs index 09a8a3d665d..7aa4bf2d3d9 100644 --- a/tools/ci/src/main.rs +++ b/tools/ci/src/main.rs @@ -118,9 +118,7 @@ fn overlay_unity_meta_skeleton(pkg_id: &str) -> Result<()> { let versioned_dir = match find_only_subdir(&pkg_root) { Ok(dir) => dir, Err(err) => { - log::info!( - "Skipping Unity meta overlay for {pkg_id}: could not locate restored version dir: {err}" - ); + log::info!("Skipping Unity meta overlay for {pkg_id}: could not locate restored version dir: {err}"); return Ok(()); } };