Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make fj-viewer assets available in its crate package #1606

Merged
merged 2 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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