From 6452789b8b153feca44d081e8082c20ed7ddafd6 Mon Sep 17 00:00:00 2001 From: Ben C Date: Sun, 6 Oct 2024 12:20:40 -0400 Subject: [PATCH] Fix CI maybe --- .github/workflows/nightly_build.yml | 12 ++++++++++-- nix/owmods-gui.nix | 2 +- owmods_gui/backend/src/commands.rs | 10 ++++++++-- owmods_gui/backend/src/main.rs | 7 ++++--- owmods_gui/backend/src/protocol.rs | 6 +++++- owmods_gui/frontend/vite.config.ts | 12 ++++++------ xtask/src/gui_disable_updater.rs | 4 +--- 7 files changed, 35 insertions(+), 18 deletions(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 159d283a..f9127c66 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -53,8 +53,16 @@ jobs: - name: Install dependencies (ubuntu only) if: matrix.platform == 'ubuntu-22.04' run: | - sudo apt-get update - sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev + sudo apt update + sudo apt install libwebkit2gtk-4.1-dev \ + build-essential \ + curl \ + wget \ + file \ + libxdo-dev \ + libssl-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@stable diff --git a/nix/owmods-gui.nix b/nix/owmods-gui.nix index 7c124717..4ef2429f 100644 --- a/nix/owmods-gui.nix +++ b/nix/owmods-gui.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { inherit version; pname = "owmods_gui-ui"; - npmDepsHash = "sha256-ZD1qVbA1Aj9BAj75A2nj/kiN2O0Ulxr9KnQTRJFvyOM="; + npmDepsHash = "sha256-ePluInAXh9mUAkyNCE7jWU4Dh90xdHcVf0TInjyaF2U="; src = ../owmods_gui/frontend; packageJSON = ../owmods_gui/frontend/package.json; diff --git a/owmods_gui/backend/src/commands.rs b/owmods_gui/backend/src/commands.rs index dac94519..bb89fb22 100644 --- a/owmods_gui/backend/src/commands.rs +++ b/owmods_gui/backend/src/commands.rs @@ -345,7 +345,10 @@ pub async fn install_mod( current_mod.manifest.name )) .kind(MessageDialogKind::Info) - .buttons(MessageDialogButtons::OkCancelCustom("Yes".to_string(), "No".to_string())) + .buttons(MessageDialogButtons::OkCancelCustom( + "Yes".to_string(), + "No".to_string(), + )) .title("Reinstall?") .blocking_show(); } @@ -913,7 +916,10 @@ pub async fn db_has_issues(state: tauri::State<'_, State>, window: tauri::Window owml.manifest.version )) .kind(MessageDialogKind::Info) - .buttons(MessageDialogButtons::OkCancelCustom("Yes".to_string(), "No".to_string())) + .buttons(MessageDialogButtons::OkCancelCustom( + "Yes".to_string(), + "No".to_string(), + )) .title("Update OWML?") .blocking_show(); if answer { diff --git a/owmods_gui/backend/src/main.rs b/owmods_gui/backend/src/main.rs index f0b76543..f6defe10 100644 --- a/owmods_gui/backend/src/main.rs +++ b/owmods_gui/backend/src/main.rs @@ -94,8 +94,6 @@ pub struct State { mods_in_progress: StatePart>, } - - fn main() -> Result<(), Box> { let config = Config::get(None).unwrap_or(Config::default(None)?); let gui_config = GuiConfig::get().unwrap_or_default(); @@ -117,7 +115,7 @@ fn main() -> Result<(), Box> { }) .plugin(tauri_plugin_single_instance::init(|_app, _argv, _cwd| { println!("New app instance opened, invoked URI handler."); - })) + })) .plugin(tauri_plugin_deep_link::init()) .setup(move |app| { // Logger Setup @@ -139,6 +137,9 @@ fn main() -> Result<(), Box> { #[cfg(any(target_os = "linux", all(debug_assertions, windows)))] let res = app.deep_link().register_all(); + #[cfg(not(any(target_os = "linux", all(debug_assertions, windows))))] + let res = Result::<(), anyhow::Error>::Ok(()); + if let Err(why) = res { warn!("Failed to setup URI handler: {:?}", why); } else { diff --git a/owmods_gui/backend/src/protocol.rs b/owmods_gui/backend/src/protocol.rs index 5f0286f7..e7686fc5 100644 --- a/owmods_gui/backend/src/protocol.rs +++ b/owmods_gui/backend/src/protocol.rs @@ -11,7 +11,11 @@ pub const PROTOCOL_LISTENER_AMOUNT: usize = 2; pub fn prep_protocol(handle: tauri::AppHandle) { let handle_inner = handle.clone(); handle.deep_link().on_open_url(move |request| { - let request = request.urls().first().map(|u| u.to_string()).unwrap_or_default(); + let request = request + .urls() + .first() + .map(|u| u.to_string()) + .unwrap_or_default(); let protocol_payload = ProtocolPayload::parse(&request); match protocol_payload.verb { ProtocolVerb::Unknown => { diff --git a/owmods_gui/frontend/vite.config.ts b/owmods_gui/frontend/vite.config.ts index 082327bc..b4ca3c6c 100644 --- a/owmods_gui/frontend/vite.config.ts +++ b/owmods_gui/frontend/vite.config.ts @@ -16,12 +16,12 @@ export default defineConfig({ strictPort: true, host: host || false, hmr: host - ? { - protocol: "ws", - host, - port: 1421, - } - : undefined, + ? { + protocol: "ws", + host, + port: 1421 + } + : undefined, watch: { ignored: ["owmods_gui/backend/target/**"] } diff --git a/xtask/src/gui_disable_updater.rs b/xtask/src/gui_disable_updater.rs index fa89c187..eef31b5d 100644 --- a/xtask/src/gui_disable_updater.rs +++ b/xtask/src/gui_disable_updater.rs @@ -16,9 +16,7 @@ pub fn disable_updater() -> Result<()> { // Cargo.toml let cargo_toml = std::fs::read_to_string(GUI_CARGO_TOML_PATH)?; let mut cargo_toml = cargo_toml.parse::()?; - let features = cargo_toml["dependencies"] - .as_table_mut() - .unwrap(); + let features = cargo_toml["dependencies"].as_table_mut().unwrap(); features.remove("tauri-plugin-updater"); // Write to files std::fs::write(