Skip to content

Commit

Permalink
Merge pull request #1606 from hannobraun/install
Browse files Browse the repository at this point in the history
Make `fj-viewer` assets available in its crate package
  • Loading branch information
hannobraun authored Feb 21, 2023
2 parents f4bb6f4 + 978bdaf commit 2b09c31
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 12 deletions.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
16 changes: 8 additions & 8 deletions crates/fj-viewer/src/assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions tools/release-operator/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 2b09c31

Please sign in to comment.