From 04a26584d59996c57136861e8b3a585d6da82d80 Mon Sep 17 00:00:00 2001 From: Ben C Date: Sun, 6 Oct 2024 12:13:41 -0400 Subject: [PATCH] Fix CI, remove updater remover --- .github/workflows/nightly_build.yml | 8 ++++---- owmods_gui/backend/tauri.conf.json | 4 ++-- xtask/src/gui_disable_updater.rs | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 5f54e379..159d283a 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -81,10 +81,10 @@ jobs: - name: Install Tauri CLI run: npm add -g @tauri-apps/cli - - name: Disable Tauri Updater - if: matrix.platform == 'ubuntu-22.04' - run: | - cargo xtask gui_disable_updater + # - name: Disable Tauri Updater + # if: matrix.platform == 'ubuntu-22.04' + # run: | + # cargo xtask gui_disable_updater - name: Build GUI run: tauri build --ci -b ${{ matrix.args }} diff --git a/owmods_gui/backend/tauri.conf.json b/owmods_gui/backend/tauri.conf.json index e48049ec..6ccbbb13 100644 --- a/owmods_gui/backend/tauri.conf.json +++ b/owmods_gui/backend/tauri.conf.json @@ -1,8 +1,8 @@ { "$schema": "https://schema.tauri.app/config/2.0.0", "build": { - "beforeBuildCommand": "cd frontend && npm run build", - "beforeDevCommand": "cd frontend && npm run dev", + "beforeBuildCommand": "npm run build", + "beforeDevCommand": "npm run dev", "devUrl": "http://localhost:1420", "frontendDist": "../dist" }, diff --git a/xtask/src/gui_disable_updater.rs b/xtask/src/gui_disable_updater.rs index d8f31f8a..fa89c187 100644 --- a/xtask/src/gui_disable_updater.rs +++ b/xtask/src/gui_disable_updater.rs @@ -12,14 +12,14 @@ pub fn disable_updater() -> Result<()> { // tauri.conf.json let tauri_conf = std::fs::read_to_string(GUI_TAURI_CONF_PATH)?; let mut tauri_conf: Value = from_str(&tauri_conf)?; - tauri_conf["tauri"]["updater"]["active"] = false.into(); + tauri_conf["plugins"]["updater"]["active"] = false.into(); // 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"]["tauri"]["features"] - .as_array_mut() + let features = cargo_toml["dependencies"] + .as_table_mut() .unwrap(); - features.retain(|f| f.as_str().unwrap() != "updater"); + features.remove("tauri-plugin-updater"); // Write to files std::fs::write( GUI_TAURI_CONF_PATH,