CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-06 13:53:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(ci): also test on Windows and macOS (#366)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2023-05-17 20:53:03 -03:00
committed by GitHub
parent 22991af9f4
commit b064718f32
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/notification/src/desktop.rs
+1 -1
View File
@@ -243,7 +243,7 @@ mod imp {
#[cfg(all(windows, feature = "windows7-compat"))]
fn notify_win7<R: tauri::Runtime>(self, app: &tauri::AppHandle<R>) -> crate::Result<()> {
let app = app.clone();
let default_window_icon = app.manager.inner.default_window_icon.clone();
let default_window_icon = app.default_window_icon().cloned();
let _ = app.run_on_main_thread(move || {
let mut notification = win7_notifications::Notification::new();
if let Some(body) = self.body {
plugins/updater/src/updater/core.rs
+4 -3
View File
@@ -610,7 +610,7 @@ impl<R: Runtime> Update<R> {
&self.extract_path,
self.with_elevated_task,
&self.app.config(),
&self.app.state::<UpdaterState>().config,
&self.app.state::<crate::UpdaterState>().config,
)?;
#[cfg(not(target_os = "windows"))]
copy_files_and_run(archive_buffer, &self.extract_path)?;
@@ -738,7 +738,7 @@ fn copy_files_and_run<R: Read + Seek>(
// Run the EXE
let mut installer = Command::new(found_path);
if tauri::utils::config::WindowsUpdateInstallMode::Quiet
== config.tauri.bundle.updater.install_mode
== config.tauri.bundle.updater.windows.install_mode
{
installer.arg("/S");
}
@@ -798,10 +798,11 @@ fn copy_files_and_run<R: Read + Seek>(
msi_path_arg.push(&found_path);
msi_path_arg.push("\"\"\"");
let mut msiexec_args = updater_config
let mut msiexec_args = config
.tauri
.bundle
.updater
.windows
.install_mode
.clone()
.msiexec_args()