From 13d4992a4ab85600922a6b68924746f74a72f116 Mon Sep 17 00:00:00 2001 From: TJ Sharp Date: Fri, 14 Jan 2022 14:02:26 -0800 Subject: [PATCH 1/3] Add ubuntu 18 build --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4056f327..8612b2f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,10 @@ jobs: os_type: ubuntu artifact_name: manta-signer asset_name: manta-signer-linux-amd64 + - os: ubuntu-18.04 + os_type: ubuntu + artifact_name: manta-signer + asset_name: manta-signer-linux-amd64 - os: windows-2019 os_type: windows artifact_name: manta-signer From 630677865bbfba0c2db7605e8dd26890978f459d Mon Sep 17 00:00:00 2001 From: TJ Sharp Date: Tue, 18 Jan 2022 14:28:53 -0800 Subject: [PATCH 2/3] Hide window --- ui/src-tauri/Cargo.lock | 4 ++-- ui/src-tauri/src/main.rs | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock index 043790e9..68542370 100644 --- a/ui/src-tauri/Cargo.lock +++ b/ui/src-tauri/Cargo.lock @@ -2796,7 +2796,7 @@ dependencies = [ [[package]] name = "manta-signer" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ark-serialize", "async-std", @@ -2824,7 +2824,7 @@ dependencies = [ [[package]] name = "manta-signer-ui" -version = "0.5.0" +version = "0.5.1" dependencies = [ "async-std", "manta-signer", diff --git a/ui/src-tauri/src/main.rs b/ui/src-tauri/src/main.rs index eda4ee7b..e99114ab 100644 --- a/ui/src-tauri/src/main.rs +++ b/ui/src-tauri/src/main.rs @@ -365,13 +365,19 @@ fn main() { app.set_activation_policy(tauri::ActivationPolicy::Accessory); app.run(|app, event| { - if let Event::CloseRequested { label, api, .. } = event { - api.prevent_close(); - match label.as_str() { - "about" => app.get_window(&label).unwrap().hide().unwrap(), - "main" => app.exit(0), - _ => unreachable!("There are no other windows."), + match event { + Event::Ready => { + app.get_window("about").unwrap().hide().unwrap(); } + Event::CloseRequested { label, api, .. } => { + api.prevent_close(); + match label.as_str() { + "about" => app.get_window(&label).unwrap().hide().unwrap(), + "main" => app.exit(0), + _ => unreachable!("There are no other windows."), + } + } + _ => () } }) } From 2ff85f8ce0a2aac9e440f316257e0d00bbad40ef Mon Sep 17 00:00:00 2001 From: "Brandon H. Gomes" Date: Tue, 18 Jan 2022 22:40:33 -0500 Subject: [PATCH 3/3] fix: run rustfmt on ui/src-tauri --- ui/src-tauri/src/main.rs | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/ui/src-tauri/src/main.rs b/ui/src-tauri/src/main.rs index e99114ab..cf8bd882 100644 --- a/ui/src-tauri/src/main.rs +++ b/ui/src-tauri/src/main.rs @@ -364,20 +364,16 @@ fn main() { #[cfg(target_os = "macos")] app.set_activation_policy(tauri::ActivationPolicy::Accessory); - app.run(|app, event| { - match event { - Event::Ready => { - app.get_window("about").unwrap().hide().unwrap(); + app.run(|app, event| match event { + Event::Ready => app.get_window("about").unwrap().hide().unwrap(), + Event::CloseRequested { label, api, .. } => { + api.prevent_close(); + match label.as_str() { + "about" => app.get_window(&label).unwrap().hide().unwrap(), + "main" => app.exit(0), + _ => unreachable!("There are no other windows."), } - Event::CloseRequested { label, api, .. } => { - api.prevent_close(); - match label.as_str() { - "about" => app.get_window(&label).unwrap().hide().unwrap(), - "main" => app.exit(0), - _ => unreachable!("There are no other windows."), - } - } - _ => () } + _ => (), }) }