mirror of https://github.com/Leinnan/rpack.git
Fix
This commit is contained in:
parent
631b841c1c
commit
fa4d218dae
|
|
@ -10,36 +10,6 @@ env:
|
||||||
RUSTDOCFLAGS: -D warnings
|
RUSTDOCFLAGS: -D warnings
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# check:
|
|
||||||
# name: Check
|
|
||||||
# runs-on: ubuntu-latest
|
|
||||||
# steps:
|
|
||||||
# - uses: actions/checkout@v4
|
|
||||||
# - uses: actions-rs/toolchain@v1
|
|
||||||
# with:
|
|
||||||
# profile: minimal
|
|
||||||
# toolchain: stable
|
|
||||||
# override: true
|
|
||||||
# - uses: actions-rs/cargo@v1
|
|
||||||
# with:
|
|
||||||
# command: check
|
|
||||||
# args: --all-features --lib
|
|
||||||
|
|
||||||
check_wasm:
|
|
||||||
name: Check wasm32
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
profile: minimal
|
|
||||||
toolchain: stable
|
|
||||||
target: wasm32-unknown-unknown
|
|
||||||
override: true
|
|
||||||
- uses: actions-rs/cargo@v1
|
|
||||||
with:
|
|
||||||
command: check
|
|
||||||
args: --all-features --lib --target wasm32-unknown-unknown
|
|
||||||
fmt:
|
fmt:
|
||||||
name: Rustfmt
|
name: Rustfmt
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
@ -73,3 +43,7 @@ jobs:
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: crates/rpack_egui
|
working-directory: crates/rpack_egui
|
||||||
run: ./trunk build
|
run: ./trunk build
|
||||||
|
- uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: check
|
||||||
|
args: --all-features --lib --target wasm32-unknown-unknown
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
|
|
@ -1,5 +1,3 @@
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use egui::{
|
use egui::{
|
||||||
CollapsingHeader, Color32, FontFamily, FontId, Grid, Image, Label, Layout, RichText,
|
CollapsingHeader, Color32, FontFamily, FontId, Grid, Image, Label, Layout, RichText,
|
||||||
util::undoer::Undoer,
|
util::undoer::Undoer,
|
||||||
|
|
@ -160,6 +158,7 @@ impl Application {
|
||||||
let mut app = Self::default();
|
let mut app = Self::default();
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
if let Some(config_file) = config_file {
|
if let Some(config_file) = config_file {
|
||||||
|
use std::path::PathBuf;
|
||||||
if let Ok(config) = rpack_cli::TilemapGenerationConfig::read_from_file(&config_file) {
|
if let Ok(config) = rpack_cli::TilemapGenerationConfig::read_from_file(&config_file) {
|
||||||
app.data.settings.filename = PathBuf::from(config_file)
|
app.data.settings.filename = PathBuf::from(config_file)
|
||||||
.file_name()
|
.file_name()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue