Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
kandrelczyk committed Jan 28, 2025
1 parent 308788c commit d7f119d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
cargo install --path .
cargo install tauri-cli --version "^2.0.0" --locked
cargo install trunk
npm install tailwindcss @tailwindcss/cli
npm install -g tailwindcss@3.4.17
rustup target add wasm32-unknown-unknown
- uses: tauri-apps/tauri-action@v0
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
cargo install --path .
cargo install tauri-cli --version "^2.0.0" --locked
cargo install trunk
npm install -g tailwindcss
npm install -g tailwindcss@3.4.17
cargo tauri android init
cargo tauri icon icon.png
./copy-android.sh
Expand Down
2 changes: 1 addition & 1 deletion Trunk.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ open = false
[[hooks]]
stage = "pre_build"
command = "sh"
command_arguments = ["-c", "npx @tailwindcss/cli -i input.css -o style/output.css"]
command_arguments = ["-c", "npx tailwindcss -i input.css -o style/output.css"]
20 changes: 10 additions & 10 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ impl AppBuilder {
.set(".settings.dat".to_owned())
.expect("Failed to set settings file");
}
#[cfg(not(any(mobile, debug_assertions)))]
{
let handle = app.handle().clone();
tauri::async_runtime::spawn(async move {
match update(handle).await {
Ok(_) => println!("Update check successfull"),
Err(_) => println!("Update not found"),
}
});
}
//#[cfg(not(any(mobile, debug_assertions)))]
//{
//let handle = app.handle().clone();
//tauri::async_runtime::spawn(async move {
//match update(handle).await {
//Ok(_) => println!("Update check successfull"),
//Err(e) => println!("Updated not installed: {:?}", e),
//}
//});
//}
Ok(())
})
.invoke_handler(tauri::generate_handler![
Expand Down

0 comments on commit d7f119d

Please sign in to comment.