mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-10-26 09:58:16 +03:00
parent
2a9a28044b
commit
db9ec4e79c
@ -105,6 +105,7 @@ jobs:
|
||||
cargo update -p tree_magic_mini --precise 3.0.3
|
||||
cargo update -p tokio-test --precise 0.4.3
|
||||
cargo update -p tokio-stream --precise 0.1.14
|
||||
cargo update -p tokio-util --precise 0.7.10
|
||||
|
||||
- name: test build
|
||||
run: cargo check --target ${{ matrix.platform.target }} --features tracing,compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test
|
||||
|
@ -570,7 +570,7 @@ pub fn build_wix_app_installer(
|
||||
let merge_modules = get_merge_modules(settings)?;
|
||||
data.insert("merge_modules", to_json(merge_modules));
|
||||
|
||||
data.insert("app_exe_source", to_json(&app_exe_source));
|
||||
data.insert("app_exe_source", to_json(app_exe_source));
|
||||
|
||||
// copy icon from `settings.windows().icon_path` folder to resource folder near msi
|
||||
let icon_path = copy_icon(settings, "icon.ico", &settings.windows().icon_path)?;
|
||||
@ -589,9 +589,9 @@ pub fn build_wix_app_installer(
|
||||
data.insert("feature_group_refs", to_json(&wix.feature_group_refs));
|
||||
data.insert("feature_refs", to_json(&wix.feature_refs));
|
||||
data.insert("merge_refs", to_json(&wix.merge_refs));
|
||||
fragment_paths = wix.fragment_paths.clone();
|
||||
fragment_paths.clone_from(&wix.fragment_paths);
|
||||
enable_elevated_update_task = wix.enable_elevated_update_task;
|
||||
custom_template_path = wix.template.clone();
|
||||
custom_template_path.clone_from(&wix.template);
|
||||
|
||||
if let Some(banner_path) = &wix.banner_path {
|
||||
let filename = banner_path
|
||||
|
@ -223,8 +223,8 @@ fn build_nsis_app_installer(
|
||||
let mut custom_template_path = None;
|
||||
let mut custom_language_files = None;
|
||||
if let Some(nsis) = &settings.windows().nsis {
|
||||
custom_template_path = nsis.template.clone();
|
||||
custom_language_files = nsis.custom_language_files.clone();
|
||||
custom_template_path.clone_from(&nsis.template);
|
||||
custom_language_files.clone_from(&nsis.custom_language_files);
|
||||
install_mode = nsis.install_mode;
|
||||
if let Some(langs) = &nsis.languages {
|
||||
languages.clear();
|
||||
|
@ -94,7 +94,7 @@ pub fn verify(path: &Path) -> crate::Result<bool> {
|
||||
// Construct SignTool command
|
||||
let signtool = locate_signtool()?;
|
||||
|
||||
let mut cmd = Command::new(&signtool);
|
||||
let mut cmd = Command::new(signtool);
|
||||
cmd.arg("verify");
|
||||
cmd.arg("/pa");
|
||||
cmd.arg(path);
|
||||
|
Loading…
Reference in New Issue
Block a user