From a06b19798e622787846f722944ae13d88c1bc50e Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 21 Feb 2023 12:31:45 +0100 Subject: [PATCH 1/2] Move assets into `fj-viewer` crate They are used there at compile-time. Them being outside of the directory means they are not included in the crate package, which breaks `cargo install`. --- .../assets}/navigation_cube/bottom.png | Bin .../assets}/navigation_cube/cube.blend | Bin .../fj-viewer/assets}/navigation_cube/cube.mtl | 0 .../fj-viewer/assets}/navigation_cube/cube.obj | 0 .../fj-viewer/assets}/navigation_cube/front.png | Bin .../fj-viewer/assets}/navigation_cube/left.png | Bin .../fj-viewer/assets}/navigation_cube/rear.png | Bin .../fj-viewer/assets}/navigation_cube/right.png | Bin .../fj-viewer/assets}/navigation_cube/top.png | Bin crates/fj-viewer/src/assets.rs | 16 ++++++++-------- 10 files changed, 8 insertions(+), 8 deletions(-) rename {assets => crates/fj-viewer/assets}/navigation_cube/bottom.png (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/cube.blend (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/cube.mtl (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/cube.obj (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/front.png (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/left.png (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/rear.png (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/right.png (100%) rename {assets => crates/fj-viewer/assets}/navigation_cube/top.png (100%) diff --git a/assets/navigation_cube/bottom.png b/crates/fj-viewer/assets/navigation_cube/bottom.png similarity index 100% rename from assets/navigation_cube/bottom.png rename to crates/fj-viewer/assets/navigation_cube/bottom.png diff --git a/assets/navigation_cube/cube.blend b/crates/fj-viewer/assets/navigation_cube/cube.blend similarity index 100% rename from assets/navigation_cube/cube.blend rename to crates/fj-viewer/assets/navigation_cube/cube.blend diff --git a/assets/navigation_cube/cube.mtl b/crates/fj-viewer/assets/navigation_cube/cube.mtl similarity index 100% rename from assets/navigation_cube/cube.mtl rename to crates/fj-viewer/assets/navigation_cube/cube.mtl diff --git a/assets/navigation_cube/cube.obj b/crates/fj-viewer/assets/navigation_cube/cube.obj similarity index 100% rename from assets/navigation_cube/cube.obj rename to crates/fj-viewer/assets/navigation_cube/cube.obj diff --git a/assets/navigation_cube/front.png b/crates/fj-viewer/assets/navigation_cube/front.png similarity index 100% rename from assets/navigation_cube/front.png rename to crates/fj-viewer/assets/navigation_cube/front.png diff --git a/assets/navigation_cube/left.png b/crates/fj-viewer/assets/navigation_cube/left.png similarity index 100% rename from assets/navigation_cube/left.png rename to crates/fj-viewer/assets/navigation_cube/left.png diff --git a/assets/navigation_cube/rear.png b/crates/fj-viewer/assets/navigation_cube/rear.png similarity index 100% rename from assets/navigation_cube/rear.png rename to crates/fj-viewer/assets/navigation_cube/rear.png diff --git a/assets/navigation_cube/right.png b/crates/fj-viewer/assets/navigation_cube/right.png similarity index 100% rename from assets/navigation_cube/right.png rename to crates/fj-viewer/assets/navigation_cube/right.png diff --git a/assets/navigation_cube/top.png b/crates/fj-viewer/assets/navigation_cube/top.png similarity index 100% rename from assets/navigation_cube/top.png rename to crates/fj-viewer/assets/navigation_cube/top.png diff --git a/crates/fj-viewer/src/assets.rs b/crates/fj-viewer/src/assets.rs index 9e98d806c..49f94cf47 100644 --- a/crates/fj-viewer/src/assets.rs +++ b/crates/fj-viewer/src/assets.rs @@ -12,21 +12,21 @@ pub struct Assets<'a> { impl<'a> Assets<'a> { pub fn get_instance() -> Self { let cube_obj: &[u8] = - include_bytes!("../../../assets/navigation_cube/cube.obj"); + include_bytes!("../assets/navigation_cube/cube.obj"); let cube_mtl: &[u8] = - include_bytes!("../../../assets/navigation_cube/cube.mtl"); + include_bytes!("../assets/navigation_cube/cube.mtl"); let front_texture: &[u8] = - include_bytes!("../../../assets/navigation_cube/front.png"); + include_bytes!("../assets/navigation_cube/front.png"); let right_texture: &[u8] = - include_bytes!("../../../assets/navigation_cube/right.png"); + include_bytes!("../assets/navigation_cube/right.png"); let rear_texture: &[u8] = - include_bytes!("../../../assets/navigation_cube/rear.png"); + include_bytes!("../assets/navigation_cube/rear.png"); let left_texture: &[u8] = - include_bytes!("../../../assets/navigation_cube/left.png"); + include_bytes!("../assets/navigation_cube/left.png"); let top_texture: &[u8] = - include_bytes!("../../../assets/navigation_cube/top.png"); + include_bytes!("../assets/navigation_cube/top.png"); let bottom_texture: &[u8] = - include_bytes!("../../../assets/navigation_cube/bottom.png"); + include_bytes!("../assets/navigation_cube/bottom.png"); Self { cube_obj, From 978bdaf8fea3090805b9f215bbf423db334a487b Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 21 Feb 2023 12:39:38 +0100 Subject: [PATCH 2/2] Publish crates without `--no-verify` We've had multiple bug breaking `cargo install` now, which would have been caught by this. --- tools/release-operator/src/registry.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/release-operator/src/registry.rs b/tools/release-operator/src/registry.rs index 49690178b..71fe085d4 100644 --- a/tools/release-operator/src/registry.rs +++ b/tools/release-operator/src/registry.rs @@ -189,10 +189,6 @@ impl Crate { command .arg("publish") .args(["--token", token.unsecure()]) - // By this point in the process, the crates have been built - // successfully multiple times. No reason to slow down the - // release by building them again. - .arg("--no-verify") .current_dir(&self.path); if dry_run {